Merge branch 'main' into local-pty

Author: sreya

.github/actions/setup-mux/action.yml

@@ -14,6 +14,7 @@ runs:
       run: echo "version=$(bun --version)" >> $GITHUB_OUTPUT
 
     - name: Cache node_modules
+      id: cache-node-modules
       uses: actions/cache@v4
       with:
         path: node_modules
@@ -22,6 +23,7 @@ runs:
           ${{ runner.os }}-${{ runner.arch }}-bun-${{ steps.bun-version.outputs.version }}-node-modules-
 
     - name: Cache bun install cache
+      id: cache-bun-install
       uses: actions/cache@v4
       with:
         path: ~/.bun/install/cache
@@ -30,6 +32,7 @@ runs:
           ${{ runner.os }}-bun-cache-
 
     - name: Install dependencies
+      if: steps.cache-node-modules.outputs.cache-hit != 'true'
       shell: bash
       run: bun install --frozen-lockfile
 

src/components/WorkspaceListItem.tsx

@@ -164,7 +164,7 @@ const WorkspaceListItemInner: React.FC<WorkspaceListItemProps> = ({
                 title="Double-click to rename"
               >
                 {canInterrupt ? (
-                  <Shimmer className="h-4 w-full truncate" colorClass="var(--color-foreground)">
+                  <Shimmer className="w-full truncate" colorClass="var(--color-foreground)">
                     {displayName}
                   </Shimmer>
                 ) : (

src/components/ai-elements/shimmer.tsx

@@ -29,7 +29,7 @@ const ShimmerComponent = ({
     <MotionComponent
       animate={{ backgroundPosition: "0% center" }}
       className={cn(
-        "relative inline-block bg-[length:250%_100%,auto] bg-clip-text text-transparent",
+        "relative bg-[length:250%_100%,auto] bg-clip-text text-transparent",
         "[--bg:linear-gradient(90deg,#0000_calc(50%-var(--spread)),var(--color-background),#0000_calc(50%+var(--spread)))] [background-repeat:no-repeat,padding-box]",
         className
       )}

src/services/tools/file_edit_insert.test.ts

@@ -96,13 +96,12 @@ describe("file_edit_insert tool", () => {
     }
   });
 
-  it("creates new file when create flag is provided", async () => {
+  it("creates a new file without requiring create flag or guards", async () => {
     const newFile = path.join(testDir, "new.txt");
     const tool = createTestTool(testDir);
     const args: FileEditInsertToolArgs = {
       file_path: path.relative(testDir, newFile),
       content: "Hello world!\n",
-      create: true,
     };
 
     const result = (await tool.execute!(args, mockToolCallOptions)) as FileEditInsertToolResult;

src/services/tools/file_edit_insert.ts

@@ -48,7 +48,7 @@ export const createFileEditInsertTool: ToolFactory = (config: ToolConfiguration)
     description: TOOL_DEFINITIONS.file_edit_insert.description,
     inputSchema: TOOL_DEFINITIONS.file_edit_insert.schema,
     execute: async (
-      { file_path, content, before, after, create }: FileEditInsertToolArgs,
+      { file_path, content, before, after }: FileEditInsertToolArgs,
       { abortSignal }
     ): Promise<FileEditInsertToolResult> => {
       try {
@@ -71,14 +71,6 @@ export const createFileEditInsertTool: ToolFactory = (config: ToolConfiguration)
         const exists = await fileExists(config.runtime, resolvedPath, abortSignal);
 
         if (!exists) {
-          if (!create) {
-            return {
-              success: false,
-              error: `File not found: ${file_path}. Set create: true to create it.`,
-              note: `${EDIT_FAILED_NOTE_PREFIX} File does not exist. Set create: true to create it, or check the file path.`,
-            };
-          }
-
           try {
             await writeFileString(config.runtime, resolvedPath, content, abortSignal);
           } catch (err) {
@@ -139,7 +131,7 @@ function insertContent(
   }
 
   if (before === undefined && after === undefined) {
-    return guardFailure("Provide either a before or after guard to anchor the insertion point.");
+    return guardFailure("Provide either a before or after guard when editing existing files.");
   }
 
   return insertWithGuards(originalContent, contentToInsert, { before, after });

src/telemetry/utils.ts

@@ -9,8 +9,15 @@ import { VERSION } from "../version";
  * Get base telemetry properties included with all events
  */
 export function getBaseTelemetryProperties(): BaseTelemetryProperties {
+  const gitDescribe =
+    typeof VERSION === "object" &&
+    VERSION !== null &&
+    typeof (VERSION as Record<string, unknown>).git_describe === "string"
+      ? (VERSION as { git_describe: string }).git_describe
+      : "unknown";
+
   return {
-    version: String(VERSION.git_describe),
+    version: gitDescribe,
     platform: window.api?.platform || "unknown",
     electronVersion: window.api?.versions?.electron || "unknown",
   };

src/types/tools.ts

@@ -74,8 +74,6 @@ export interface FileEditErrorResult {
 export interface FileEditInsertToolArgs {
   file_path: string;
   content: string;
-  /** When true, create the file if it doesn't exist */
-  create?: boolean;
   /** Optional substring that must appear immediately before the insertion point */
   before?: string;
   /** Optional substring that must appear immediately after the insertion point */

src/utils/tools/toolDefinitions.ts

@@ -116,13 +116,12 @@ export const TOOL_DEFINITIONS = {
     description:
       "Insert content into a file using substring guards. " +
       "Provide exactly one of before or after to anchor the operation when editing an existing file. " +
-      "Set create: true to write a brand new file without guards. " +
+      "When the file does not exist, it is created automatically without guards. " +
       `Optional before/after substrings must uniquely match surrounding content. ${TOOL_EDIT_WARNING}`,
     schema: z
       .object({
         file_path: FILE_EDIT_FILE_PATH,
         content: z.string().describe("The content to insert"),
-        create: z.boolean().optional().describe("If true, create the file if it does not exist"),
         before: z
           .string()
           .min(1)
@@ -134,14 +133,6 @@ export const TOOL_DEFINITIONS = {
           .optional()
           .describe("Optional substring that must appear immediately after the insertion point"),
       })
-      .refine(
-        (data) => data.create === true || data.before !== undefined || data.after !== undefined,
-        {
-          message:
-            "Provide before or after when editing existing files, or set create: true to write a new file.",
-          path: ["before"],
-        }
-      )
       .refine((data) => !(data.before !== undefined && data.after !== undefined), {
         message: "Provide only one of before or after (not both).",
         path: ["before"],

tests/ipcMain/runtimeExecuteBash.test.ts

@@ -33,6 +33,7 @@ import {
   type SSHServerConfig,
 } from "../runtime/ssh-fixture";
 import type { RuntimeConfig } from "../../src/types/runtime";
+import type { WorkspaceChatMessage } from "../../src/types/ipc";
 import type { ToolPolicy } from "../../src/utils/tools/toolPolicy";
 
 // Tool policy: Only allow bash tool
@@ -41,6 +42,16 @@ const BASH_ONLY: ToolPolicy = [
   { regex_match: "file_.*", action: "disable" },
 ];
 
+function collectToolOutputs(events: WorkspaceChatMessage[], toolName: string): string {
+  return events
+    .filter((event: any) => event.type === "tool-call-end" && event.toolName === toolName)
+    .map((event: any) => {
+      const output = event.result?.output;
+      return typeof output === "string" ? output : "";
+    })
+    .join("\n");
+}
+
 // Skip all tests if TEST_INTEGRATION is not set
 const describeIntegration = shouldRunIntegrationTests() ? describe : describe.skip;
 
@@ -264,7 +275,8 @@ describeIntegration("Runtime Bash Execution", () => {
 
               // Verify command completed successfully (not timeout)
               expect(responseText).toContain("test");
-              expect(responseText).toContain("data");
+              const bashOutput = collectToolOutputs(events, "bash");
+              expect(bashOutput).toContain('"test": "data"');
 
               // Verify command completed quickly (not hanging until timeout)
               // With tokenizer preloading, both local and SSH complete in ~8s total