Resolve merge conflict in ToolCallDisplay.tsx

Merged changes from main while preserving clickable functionality:
- Added ToolTruncateHistoryIcon import from main
- Updated flex alignment to items-start from main
- Kept clickable div with hover effects and click handler

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: Patrick-Erichsen

core/config/markdown/utils.ts

@@ -4,18 +4,24 @@ import {
 } from "@continuedev/config-yaml";
 import { joinPathsToUri } from "../../util/uri";
 
+function createRelativeRuleFilePathParts(ruleName: string): string[] {
+  const safeRuleName = sanitizeRuleName(ruleName);
+  return [".continue", "rules", `${safeRuleName}.${RULE_FILE_EXTENSION}`];
+}
+
+export function createRelativeRuleFilePath(ruleName: string): string {
+  return createRelativeRuleFilePathParts(ruleName).join("/");
+}
+
 /**
  * Creates the file path for a rule in the workspace .continue/rules directory
  */
 export function createRuleFilePath(
   workspaceDir: string,
   ruleName: string,
 ): string {
-  const safeRuleName = sanitizeRuleName(ruleName);
   return joinPathsToUri(
     workspaceDir,
-    ".continue",
-    "rules",
-    `${safeRuleName}.${RULE_FILE_EXTENSION}`,
+    ...createRelativeRuleFilePathParts(ruleName),
   );
 }

core/llm/index.ts

@@ -213,7 +213,7 @@ export abstract class BaseLLM implements ILLM {
       this.providerName === "continue-proxy"
         ? this.model?.split("/").pop() || this.model
         : this.model;
-    const llmInfo = findLlmInfo(modelSearchString);
+    const llmInfo = findLlmInfo(modelSearchString, this.underlyingProviderName);
 
     const templateType =
       options.template ?? autodetectTemplateType(options.model);

core/package-lock.json

@@ -1,9 +1,11 @@
 import { type AssistantConfig } from "@continuedev/sdk";
+import { createRelativeRuleFilePath } from "core/config/markdown/utils.js";
 
 import { SlashCommandResult } from "../ui/hooks/useChat.types.js";
 
 function createInitPrompt(): string {
-  return `Please analyze this repository and create a comprehensive AGENTS.md file. Use your available tools to understand the project structure, read important files like README.md, package.json, requirements.txt, and other configuration files to understand the technology stack and setup.
+  const relativeRuleFilepath = createRelativeRuleFilePath("review");
+  return `Please analyze this repository and create a comprehensive AGENTS.md file, along with a custom slash command. Use your available tools to understand the project structure, read important files like README.md, package.json, requirements.txt, and other configuration files to understand the technology stack and setup.
 
 Create an AGENTS.md file with the following structure:
 
@@ -30,7 +32,23 @@ Create an AGENTS.md file with the following structure:
 - Development environment setup
 - Lint and format commands
 
-Please create the AGENTS.md file using the Write tool after analyzing the repository. Focus on providing actionable information that would help both AI agents and human developers understand and work effectively with this codebase. Keep the file concise but informational.`;
+Additionally, create a slash command file at ${relativeRuleFilepath} with the following structure:
+
+\`\`\`md
+---
+invokable: true
+---
+
+Review this code for potential issues, including:
+
+<insert custom things to look for based on the repository details you find>
+
+Provide specific, actionable feedback for improvements.
+\`\`\`
+
+This slash command will be invokable using /review and will provide instructions for code review tasks common to this repository.
+
+Please create both the AGENTS.md file and the .continue/rules/review.md file using the Write tool after analyzing the repository. Focus on providing actionable information that would help both AI agents and human developers understand and work effectively with this codebase. Keep the files concise but informational.`;
 }
 
 export async function handleInit(

extensions/cli/src/commands/init.ts

@@ -0,0 +1,63 @@
+import { render } from "ink-testing-library";
+import React from "react";
+
+import { ChecklistDisplay } from "./ChecklistDisplay.js";
+
+describe("ChecklistDisplay", () => {
+  it("should highlight the first incomplete item", () => {
+    const content = `Task list status:
+- [x] Completed task
+- [ ] First incomplete task
+- [ ] Second incomplete task`;
+
+    const { lastFrame } = render(<ChecklistDisplay content={content} />);
+    const output = lastFrame();
+
+    // The output should contain the checkbox symbols and text
+    expect(output).toContain("✓");
+    expect(output).toContain("○");
+    expect(output).toContain("Completed task");
+    expect(output).toContain("First incomplete task");
+    expect(output).toContain("Second incomplete task");
+  });
+
+  it("should handle empty checklist", () => {
+    const content = "Task list status:";
+
+    const { lastFrame } = render(<ChecklistDisplay content={content} />);
+    const output = lastFrame();
+
+    expect(output).toBeDefined();
+  });
+
+  it("should handle all completed tasks", () => {
+    const content = `Task list status:
+- [x] Completed task 1
+- [x] Completed task 2`;
+
+    const { lastFrame } = render(<ChecklistDisplay content={content} />);
+    const output = lastFrame();
+
+    expect(output).toContain("✓");
+    expect(output).toContain("Completed task 1");
+    expect(output).toContain("Completed task 2");
+  });
+
+  it("should handle mixed content with headers", () => {
+    const content = `Task list status:
+## Important Tasks
+- [x] Done task
+- [ ] Todo task
+
+## Other Tasks
+- [ ] Another todo`;
+
+    const { lastFrame } = render(<ChecklistDisplay content={content} />);
+    const output = lastFrame();
+
+    expect(output).toContain("Important Tasks");
+    expect(output).toContain("Other Tasks");
+    expect(output).toContain("✓");
+    expect(output).toContain("○");
+  });
+});

extensions/cli/src/ui/components/ChecklistDisplay.test.tsx

@@ -13,6 +13,17 @@ export const ChecklistDisplay: React.FC<ChecklistDisplayProps> = ({
 }) => {
   const lines = content.split("\n");
 
+  // Find the index of the first incomplete checkbox item
+  let firstIncompleteIndex = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const checkboxMatch = line.match(/^(\s*)-\s*\[([ x])\]\s*(.*)$/);
+    if (checkboxMatch && checkboxMatch[2] === " ") {
+      firstIncompleteIndex = i;
+      break;
+    }
+  }
+
   return (
     <Box flexDirection="column" paddingLeft={2}>
       {lines.map((line, index) => {
@@ -25,6 +36,7 @@ export const ChecklistDisplay: React.FC<ChecklistDisplayProps> = ({
         if (checkboxMatch) {
           const [, indent, status, taskText] = checkboxMatch;
           const isCompleted = status === "x";
+          const isFirstIncomplete = index === firstIncompleteIndex;
 
           return (
             <Box key={index}>
@@ -34,8 +46,11 @@ export const ChecklistDisplay: React.FC<ChecklistDisplayProps> = ({
               </Text>
               <Text> </Text>
               <Text
-                color={isCompleted ? "gray" : "white"}
+                color={
+                  isCompleted ? "gray" : isFirstIncomplete ? "cyan" : "white"
+                }
                 strikethrough={isCompleted}
+                bold={isFirstIncomplete}
               >
                 {taskText}
               </Text>

extensions/cli/src/ui/components/ChecklistDisplay.tsx

@@ -48,9 +48,7 @@ export function SelectedAssistantButton({
           ) : (
             <>
               <AssistantIcon assistant={selectedProfile} size={iconSize} />
-              <span
-                className={`select-none truncate text-xs ${isSidebar && "hidden md:block"}`}
-              >
+              <span className={`xs:line-clamp-1 hidden select-none text-xs`}>
                 {selectedProfile.title}
               </span>
             </>

gui/src/components/AssistantAndOrgListbox/SelectedAssistantButton.tsx

@@ -150,7 +150,7 @@ export function AssistantAndOrgListbox({
         />
         <Transition>
           <ListboxOptions
-            className="max-h-32 -translate-x-1.5 overflow-y-auto pb-0"
+            className="max-h-32 scale-x-[97%] overflow-y-auto pb-0"
             style={{ zIndex: 200 }}
           >
             <div className="flex items-center justify-between px-1.5 py-1">

gui/src/components/AssistantAndOrgListbox/index.tsx

@@ -141,7 +141,7 @@ export default function MermaidDiagram({ code }: { code: string }) {
       {!!error ? (
         <div className="text-error whitespace-pre text-sm">{error}</div>
       ) : (
-        <div className="relative">
+        <div className="mermaid relative">
           <div className="absolute right-0 z-10 m-2 flex items-center gap-x-1">
             <ToolTip content={"Zoom In"}>
               <MagnifyingGlassPlusIcon

gui/src/components/StyledMarkdownPreview/MermaidBlock.tsx

@@ -84,6 +84,26 @@ const StyledMarkdown = styled.div<{
     font-family: var(--vscode-editor-font-family);
   }
 
+  ul ul,
+  ul ol,
+  ol ul,
+  ol ol {
+    padding-left: 1.5em;
+    margin-top: 1em;
+  }
+
+  li {
+    margin-bottom: 0.8em;
+  }
+  li:last-child {
+    margin-bottom: 0;
+  }
+
+  ul,
+  ol {
+    padding-left: 2em;
+  }
+
   code:not(pre > code) {
     font-family: var(--vscode-editor-font-family);
   }