@costrict/cs 2.0.2 → 2.0.4

package/bundle/gemini.js

@@ -91151,19 +91151,19 @@ var init_debugLogger = __esm({
       log(...args2) {
         this.writeToFile("LOG", args2);
         if (this.debugEnabled) {
-          console.log(...args2);
+          console.debug(...args2);
         }
       }
       warn(...args2) {
         this.writeToFile("WARN", args2);
         if (this.debugEnabled) {
-          console.warn(...args2);
+          console.debug(...args2);
         }
       }
       error(...args2) {
         this.writeToFile("ERROR", args2);
         if (this.debugEnabled) {
-          console.error(...args2);
+          console.debug(...args2);
         }
       }
       debug(...args2) {
@@ -109319,7 +109319,9 @@ var init_tools = __esm({
               timeoutId = void 0;
             }
             abortSignal.removeEventListener("abort", abortHandler);
-            this.messageBus?.unsubscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+            if (this.messageBus && typeof this.messageBus.unsubscribe === "function") {
+              this.messageBus.unsubscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+            }
           };
           const abortHandler = () => {
             cleanup();
@@ -109346,7 +109348,9 @@ var init_tools = __esm({
             cleanup();
             resolve29("ASK_USER");
           }, 3e4);
-          this.messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+          if (this.messageBus && typeof this.messageBus.subscribe === "function") {
+            this.messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+          }
           const request3 = {
             type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
             toolCall,
@@ -118583,7 +118587,7 @@ import { fileURLToPath as fileURLToPath4 } from "node:url";
 import path16 from "node:path";
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname3);
-  return "2.0.2";
+  return "2.0.4";
 }
 var __filename2, __dirname3;
 var init_version2 = __esm({
@@ -173540,8 +173544,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "5826adddd";
-    CLI_VERSION = "2.0.1";
+    GIT_COMMIT_INFO = "a48888634";
+    CLI_VERSION = "2.0.4";
   }
 });
 
@@ -261264,15 +261268,6 @@ var init_custom_llm = __esm({
         } catch (_e) {
           debugLogger.log("[CustomLLM] stream_options not supported, continuing without it");
         }
-        debugLogger.log("[CustomLLM] Sending stream request:", JSON.stringify({
-          model: requestParams.model,
-          messagesCount: messages.length,
-          messages,
-          toolsCount: tools.length,
-          includesTools: !!requestParams.tools,
-          hasStreamOptions: !!requestParams.stream_options,
-          allParams: Object.keys(requestParams)
-        }, null, 2));
         const stream2 = await this.model.chat.completions.create(requestParams);
         const map4 = /* @__PURE__ */ new Map();
         return async function* () {
@@ -262233,7 +262228,7 @@ var init_default2 = __esm({
         this.contentGeneratorConfig = contentGeneratorConfig;
       }
       buildHeaders() {
-        const version4 = "2.0.2";
+        const version4 = "2.0.4";
         const userAgent = `CoStrict/${version4} (${process.platform}; ${process.arch})`;
         return {
           "User-Agent": userAgent
@@ -262267,9 +262262,13 @@ var init_costrict = __esm({
     "use strict";
     init_dist_node();
     init_default2();
+    init_installationManager();
     CoStrictOpenAICompatibleProvider = class extends DefaultOpenAICompatibleProvider {
+      clientId;
       constructor(contentGeneratorConfig, cliConfig) {
         super(contentGeneratorConfig, cliConfig);
+        const installationManager2 = new InstallationManager();
+        this.clientId = installationManager2.getInstallationId();
       }
       /**
        * Check if this is a CoStrict provider based on base URL
@@ -262280,18 +262279,26 @@ var init_costrict = __esm({
       }
       /**
        * Build headers with CoStrict-specific requirements
+       * Note: zgsm-task-id is set dynamically to capture the current session ID
+       * This ensures that if the session ID changes (e.g., via /clear command),
+       * the header will use the updated value in subsequent requests
        */
       buildHeaders() {
         const baseHeaders = super.buildHeaders();
-        const version4 = "2.0.2";
+        const version4 = "2.0.4";
         const requestId = v7_default();
-        return {
+        const headers = {
           ...baseHeaders,
           "HTTP-Referer": "https://github.com/zgsm-ai/costrict-cli",
           "X-Title": "CoStrict CLI",
           "X-Costrict-Version": `costrict-cli-${version4}`,
-          "X-Request-ID": requestId
+          "X-Request-ID": requestId,
+          "zgsm-client-id": this.clientId,
+          "zgsm-client-ide": "cli",
+          // Capture current session ID - this will be called each time buildHeaders is invoked
+          "zgsm-task-id": this.cliConfig.getSessionId()
         };
+        return headers;
       }
     };
   }
@@ -262899,7 +262906,7 @@ var init_dashscope = __esm({
         return baseUrl === "https://dashscope.aliyuncs.com/compatible-mode/v1" || baseUrl === "https://dashscope-intl.aliyuncs.com/compatible-mode/v1";
       }
       buildHeaders() {
-        const version4 = "2.0.2";
+        const version4 = "2.0.4";
         const userAgent = `CoStrict/${version4} (${process.platform}; ${process.arch})`;
         const { authType } = this.contentGeneratorConfig;
         return {
@@ -352217,10 +352224,23 @@ var init_gitService = __esm({
           debugLogger.debug(`checkIsRepo failed, will initialize repository: ${error40 instanceof Error ? error40.message : String(error40)}`);
         }
         if (!isRepoDefined) {
-          await repo.init(false, {
-            "--initial-branch": "main"
-          });
+          try {
+            await repo.init(false, {
+              "--initial-branch": "main"
+            });
+          } catch (error40) {
+            debugLogger.debug(`init with --initial-branch failed, using fallback: ${error40 instanceof Error ? error40.message : String(error40)}`);
+            await repo.init(false);
+          }
           await repo.commit("Initial commit", { "--allow-empty": null });
+          try {
+            const currentBranch = await repo.raw(["branch", "--show-current"]);
+            if (currentBranch.trim() !== "main") {
+              await repo.raw(["branch", "-M", "main"]);
+            }
+          } catch (error40) {
+            debugLogger.debug(`Failed to rename branch to main: ${error40 instanceof Error ? error40.message : String(error40)}`);
+          }
         }
         const userGitIgnorePath = path45.join(this.projectRoot, ".gitignore");
         const shadowGitIgnorePath = path45.join(repoDir, ".gitignore");
@@ -365916,6 +365936,7 @@ var init_modelCache = __esm({
   "packages/core/dist/src/services/modelCache.js"() {
     "use strict";
     init_storage();
+    init_debugLogger();
     CACHE_VERSION2 = "1.0";
     ModelCache = class {
       /**
@@ -365929,20 +365950,20 @@ var init_modelCache = __esm({
           const content = await fs59.readFile(cachePath, "utf-8");
           const cached2 = JSON.parse(content);
           if (cached2.version !== CACHE_VERSION2) {
-            console.warn(`[ModelCache] Cache version mismatch for ${cacheKey}, ignoring`);
+            debugLogger.warn(`[ModelCache] Cache version mismatch for ${cacheKey}, ignoring`);
             return null;
           }
           if (Date.now() >= cached2.expiresAt) {
-            console.warn(`[ModelCache] Cache expired for ${cacheKey}`);
+            debugLogger.warn(`[ModelCache] Cache expired for ${cacheKey}`);
             return null;
           }
-          console.log(`[ModelCache] Cache hit for ${cacheKey}`);
+          debugLogger.log(`[ModelCache] Cache hit for ${cacheKey}`);
           return cached2.models;
         } catch (error40) {
           if (error40 && typeof error40 === "object" && "code" in error40 && error40.code === "ENOENT") {
             return null;
           }
-          console.warn(`[ModelCache] Failed to read cache for ${cacheKey}:`, error40);
+          debugLogger.warn(`[ModelCache] Failed to read cache for ${cacheKey}:`, error40);
           return null;
         }
       }
@@ -365965,9 +365986,9 @@ var init_modelCache = __esm({
             models
           };
           await fs59.writeFile(cachePath, JSON.stringify(cached2, null, 2), "utf-8");
-          console.log(`[ModelCache] Cache saved for ${cacheKey}`);
+          debugLogger.log(`[ModelCache] Cache saved for ${cacheKey}`);
         } catch (error40) {
-          console.warn(`[ModelCache] Failed to save cache for ${cacheKey}:`, error40);
+          debugLogger.warn(`[ModelCache] Failed to save cache for ${cacheKey}:`, error40);
         }
       }
       /**
@@ -365978,12 +365999,12 @@ var init_modelCache = __esm({
         try {
           const cachePath = Storage.getModelCachePath(cacheKey);
           await fs59.unlink(cachePath);
-          console.log(`[ModelCache] Cache cleared for ${cacheKey}`);
+          debugLogger.log(`[ModelCache] Cache cleared for ${cacheKey}`);
         } catch (error40) {
           if (error40 && typeof error40 === "object" && "code" in error40 && error40.code === "ENOENT") {
             return;
           }
-          console.warn(`[ModelCache] Failed to clear cache for ${cacheKey}:`, error40);
+          debugLogger.warn(`[ModelCache] Failed to clear cache for ${cacheKey}:`, error40);
         }
       }
       /**
@@ -366003,10 +366024,10 @@ var init_modelCache = __esm({
                 const cached2 = JSON.parse(content);
                 if (Date.now() >= cached2.expiresAt) {
                   await fs59.unlink(filePath);
-                  console.log(`[ModelCache] Removed expired cache: ${cached2.authType}`);
+                  debugLogger.log(`[ModelCache] Removed expired cache: ${cached2.authType}`);
                 }
               } catch (error40) {
-                console.warn(`[ModelCache] Failed to process ${file2}:`, error40);
+                debugLogger.warn(`[ModelCache] Failed to process ${file2}:`, error40);
               }
             }
           } catch (error40) {
@@ -366016,7 +366037,7 @@ var init_modelCache = __esm({
             throw error40;
           }
         } catch (error40) {
-          console.warn("[ModelCache] Failed to clear expired caches:", error40);
+          debugLogger.warn("[ModelCache] Failed to clear expired caches:", error40);
         }
       }
     };
@@ -366329,7 +366350,7 @@ var init_costrictModelProvider = __esm({
           debugLogger.warn("[CoStrictModelProvider] Failed to get auth token:", error40);
           throw new Error(`Failed to get CoStrict auth token: ${error40 instanceof Error ? error40.message : String(error40)}`);
         }
-        const version4 = "2.0.2";
+        const version4 = "2.0.4";
         const requestId = v7_default();
         const headers = {
           Authorization: `Bearer ${token2}`,
@@ -376337,7 +376358,11 @@ var init_config3 = __esm({
         this.getFileService();
         if (this.getCheckpointingEnabled()) {
           debugLogger.log("[Config.initialize] Getting GitService...");
-          await this.getGitService();
+          try {
+            await this.getGitService();
+          } catch (error40) {
+            debugLogger.warn("Failed to initialize GitService, checkpointing may not work properly:", error40);
+          }
         }
         debugLogger.log("[Config.initialize] Creating PromptRegistry and ResourceRegistry...");
         this.promptRegistry = new PromptRegistry();
@@ -376345,7 +376370,11 @@ var init_config3 = __esm({
         debugLogger.log("[Config.initialize] Creating AgentRegistry...");
         this.agentRegistry = new AgentRegistry(this);
         debugLogger.log("[Config.initialize] Initializing AgentRegistry...");
-        await this.agentRegistry.initialize();
+        try {
+          await this.agentRegistry.initialize();
+        } catch (error40) {
+          debugLogger.warn("Failed to initialize AgentRegistry:", error40);
+        }
         if (this.enableAgents) {
           const { subagentManager: subagentManager2 } = await Promise.resolve().then(() => (init_manager(), manager_exports));
           debugLogger.log("[Config.initialize] Initializing SubagentManager...");
@@ -376364,24 +376393,40 @@ var init_config3 = __esm({
         this.mcpClientManager = new McpClientManager(this.toolRegistry, this, this.eventEmitter);
         const initMcpHandle = startupProfiler.start("initialize_mcp_clients");
         debugLogger.log("[Config.initialize] Starting MCP servers and extensions...");
-        await Promise.all([
-          await this.mcpClientManager.startConfiguredMcpServers(),
-          await this.getExtensionLoader().start(this)
-        ]);
+        try {
+          await Promise.all([
+            this.mcpClientManager.startConfiguredMcpServers().catch((error40) => {
+              debugLogger.warn("Failed to start some MCP servers:", error40);
+            }),
+            this.getExtensionLoader().start(this).catch((error40) => {
+              debugLogger.warn("Failed to start extensions:", error40);
+            })
+          ]);
+        } catch (error40) {
+          debugLogger.warn("Failed to start MCP servers and extensions:", error40);
+        }
         initMcpHandle?.end();
         debugLogger.log("[Config.initialize] MCP and extensions started.");
         if (this.skillsSupport) {
           debugLogger.log("[Config.initialize] Discovering skills...");
-          await this.getSkillManager().discoverSkills(this.storage);
-          this.getSkillManager().setDisabledSkills(this.disabledSkills);
-          if (this.getSkillManager().getSkills().length > 0) {
-            this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+          try {
+            await this.getSkillManager().discoverSkills(this.storage);
+            this.getSkillManager().setDisabledSkills(this.disabledSkills);
+            if (this.getSkillManager().getSkills().length > 0) {
+              this.getToolRegistry().registerTool(new ActivateSkillTool(this, this.messageBus));
+            }
+          } catch (error40) {
+            debugLogger.warn("Failed to discover skills:", error40);
           }
         }
         if (this.enableHooks) {
           debugLogger.log("[Config.initialize] Initializing HookSystem...");
           this.hookSystem = new HookSystem(this);
-          await this.hookSystem.initialize();
+          try {
+            await this.hookSystem.initialize();
+          } catch (error40) {
+            debugLogger.warn("Failed to initialize HookSystem, hooks may not work properly:", error40);
+          }
         }
         if (this.experimentalJitContext) {
           debugLogger.log("[Config.initialize] Creating ContextManager...");
@@ -461525,7 +461570,7 @@ var RetryMessage = ({
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "0a733cf89";
+var GIT_COMMIT_INFO2 = "065d8ea7c";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 var import_jsx_runtime34 = __toESM(require_jsx_runtime(), 1);
@@ -470284,7 +470329,9 @@ function LoginDialog({
         onCancel();
       }
     },
-    { isActive: state !== "success" /* Success */ && state !== "failed" /* Failed */ }
+    {
+      isActive: state !== "success" /* Success */ && state !== "failed" /* Failed */ && state !== "cancelled" /* Cancelled */
+    }
   );
   const getStateMessage = () => {
     switch (state) {
@@ -470444,7 +470491,7 @@ function LoginDialogContainer({
       errorMessage,
       pollingAttempt,
       maxAttempts: 120,
-      onCancel: state !== "success" /* Success */ && state !== "failed" /* Failed */ ? handleCancel : void 0
+      onCancel: state !== "success" /* Success */ && state !== "failed" /* Failed */ && state !== "cancelled" /* Cancelled */ ? handleCancel : void 0
     }
   );
 }
@@ -472426,22 +472473,39 @@ var DialogManager = ({
               Date.now()
             );
             uiActions.setAuthState("unauthenticated" /* Unauthenticated */);
+            uiActions.refreshStatic();
           } else {
+            const msg = errorMessage || "Unknown error";
+            const isCancelled = msg.toLowerCase().includes("cancelled") || msg.toLowerCase().includes("aborted");
+            if (isCancelled) {
+              addItem(
+                {
+                  type: "info" /* INFO */,
+                  text: "\u2297 Login cancelled"
+                },
+                Date.now()
+              );
+              uiActions.onAuthError(null);
+              uiActions.setAuthState("updating" /* Updating */);
+              uiActions.refreshStatic();
+              return;
+            }
             addItem(
               {
                 type: "error" /* ERROR */,
                 text: [
                   "\u2717 Login failed",
                   "",
-                  `Error: ${errorMessage || "Unknown error"}`,
+                  `Error: ${msg}`,
                   "",
                   "Please try again or select a different authentication method."
                 ].join("\n")
               },
               Date.now()
             );
-            uiActions.onAuthError(errorMessage || "Login failed");
+            uiActions.onAuthError(msg);
             uiActions.setAuthState("updating" /* Updating */);
+            uiActions.refreshStatic();
           }
         }
       }
@@ -487592,13 +487656,18 @@ var costrictLoginCommand = {
               Date.now()
             );
           } else {
+            const msg = errorMessage || "Unknown error";
+            const isCancelled = msg.toLowerCase().includes("cancelled") || msg.toLowerCase().includes("aborted");
             context2.ui.addItem(
-              {
+              isCancelled ? {
+                type: "info" /* INFO */,
+                text: "\u2297 Login cancelled"
+              } : {
                 type: "error" /* ERROR */,
                 text: [
                   "\u2717 Login failed",
                   "",
-                  `Error: ${errorMessage || "Unknown error"}`,
+                  `Error: ${msg}`,
                   "",
                   "Please try again or use the IDE plugin to log in.",
                   "Credentials are shared via ~/.costrict/share/auth.json"
@@ -488588,7 +488657,10 @@ var useSlashCommandProcessor = (config2, settings, addItem, clearItems, loadHist
         extensionsUpdateState,
         dispatchExtensionStateUpdate: actions.dispatchExtensionStateUpdate,
         addConfirmUpdateExtensionRequest: actions.addConfirmUpdateExtensionRequest,
-        removeComponent: () => setCustomDialog(null)
+        removeComponent: () => {
+          setCustomDialog(null);
+          refreshStatic();
+        }
       },
       session: {
         stats: session.stats,
@@ -506398,6 +506470,15 @@ async function main() {
   const loadSettingsHandle = startupProfiler.start("load_settings");
   const settings = loadSettings();
   loadSettingsHandle?.end();
+  const earlyConsolePatcher = new ConsolePatcher({
+    stderr: true,
+    debugMode: false,
+    // Default to false to suppress debug logs
+    onNewMessage: (msg) => {
+      coreEvents.emitConsoleLog(msg.type, msg.content);
+    }
+  });
+  earlyConsolePatcher.patch();
   const shellDetectionHandle = startupProfiler.start("shell_detection");
   const detectionMode = settings.merged.tools?.shell?.detectionMode ?? "current";
   setShellDetectionMode(detectionMode);
@@ -506430,6 +506511,7 @@ async function main() {
     process.exit(ExitCodes2.FATAL_INPUT_ERROR);
   }
   const isDebugMode2 = isDebugMode(argv);
+  earlyConsolePatcher.cleanup();
   const consolePatcher = new ConsolePatcher({
     stderr: true,
     debugMode: isDebugMode2,

package/bundle/workers/call-graph-worker.js

@@ -40162,19 +40162,19 @@ var DebugLogger = class {
   log(...args2) {
     this.writeToFile("LOG", args2);
     if (this.debugEnabled) {
-      console.log(...args2);
+      console.debug(...args2);
     }
   }
   warn(...args2) {
     this.writeToFile("WARN", args2);
     if (this.debugEnabled) {
-      console.warn(...args2);
+      console.debug(...args2);
     }
   }
   error(...args2) {
     this.writeToFile("ERROR", args2);
     if (this.debugEnabled) {
-      console.error(...args2);
+      console.debug(...args2);
     }
   }
   debug(...args2) {

package/bundle/workers/ckg-build-worker.js

@@ -40912,19 +40912,19 @@ var DebugLogger = class {
   log(...args2) {
     this.writeToFile("LOG", args2);
     if (this.debugEnabled) {
-      console.log(...args2);
+      console.debug(...args2);
     }
   }
   warn(...args2) {
     this.writeToFile("WARN", args2);
     if (this.debugEnabled) {
-      console.warn(...args2);
+      console.debug(...args2);
     }
   }
   error(...args2) {
     this.writeToFile("ERROR", args2);
     if (this.debugEnabled) {
-      console.error(...args2);
+      console.debug(...args2);
     }
   }
   debug(...args2) {

package/bundle/workers/ckg-parser-worker.js

@@ -40136,19 +40136,19 @@ var DebugLogger = class {
   log(...args2) {
     this.writeToFile("LOG", args2);
     if (this.debugEnabled) {
-      console.log(...args2);
+      console.debug(...args2);
     }
   }
   warn(...args2) {
     this.writeToFile("WARN", args2);
     if (this.debugEnabled) {
-      console.warn(...args2);
+      console.debug(...args2);
     }
   }
   error(...args2) {
     this.writeToFile("ERROR", args2);
     if (this.debugEnabled) {
-      console.error(...args2);
+      console.debug(...args2);
     }
   }
   debug(...args2) {

package/bundle/workers/file-importance-worker.js

@@ -41994,19 +41994,19 @@ var DebugLogger = class {
   log(...args2) {
     this.writeToFile("LOG", args2);
     if (this.debugEnabled) {
-      console.log(...args2);
+      console.debug(...args2);
     }
   }
   warn(...args2) {
     this.writeToFile("WARN", args2);
     if (this.debugEnabled) {
-      console.warn(...args2);
+      console.debug(...args2);
     }
   }
   error(...args2) {
     this.writeToFile("ERROR", args2);
     if (this.debugEnabled) {
-      console.error(...args2);
+      console.debug(...args2);
     }
   }
   debug(...args2) {

package/bundle/workers/get-ranked-tags-worker.js

@@ -42542,19 +42542,19 @@ var DebugLogger = class {
   log(...args2) {
     this.writeToFile("LOG", args2);
     if (this.debugEnabled) {
-      console.log(...args2);
+      console.debug(...args2);
     }
   }
   warn(...args2) {
     this.writeToFile("WARN", args2);
     if (this.debugEnabled) {
-      console.warn(...args2);
+      console.debug(...args2);
     }
   }
   error(...args2) {
     this.writeToFile("ERROR", args2);
     if (this.debugEnabled) {
-      console.error(...args2);
+      console.debug(...args2);
     }
   }
   debug(...args2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@costrict/cs",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "engines": {
     "node": ">=20.0.0"
   },