Merge branch 'dev'

Author: badchars

packages/cyberstrike/src/config/markdown.ts

@@ -21,7 +21,7 @@ export namespace ConfigMarkdown {
     if (!match) return content
 
     const frontmatter = match[1]
-    const lines = frontmatter.split("\n")
+    const lines = frontmatter.split(/\r?\n/)
     const result: string[] = []
 
     for (const line of lines) {

packages/cyberstrike/src/file/index.ts

@@ -167,13 +167,6 @@ export namespace File {
     "efi",
     "rom",
     "com",
-    "bat",
-    "cmd",
-    "ps1",
-    "sh",
-    "bash",
-    "zsh",
-    "fish",
   ])
 
   const imageExtensions = new Set([

packages/cyberstrike/src/mcp/index.ts

@@ -161,17 +161,33 @@ export namespace MCP {
       description: mcpTool.description ?? "",
       inputSchema: jsonSchema(schema),
       execute: async (args: unknown) => {
-        return client.callTool(
-          {
-            name: mcpTool.name,
-            arguments: (args || {}) as Record<string, unknown>,
-          },
-          CallToolResultSchema,
-          {
-            resetTimeoutOnProgress: true,
-            timeout,
-          },
-        )
+        try {
+          return await client.callTool(
+            {
+              name: mcpTool.name,
+              arguments: (args || {}) as Record<string, unknown>,
+            },
+            CallToolResultSchema,
+            {
+              resetTimeoutOnProgress: true,
+              timeout,
+            },
+          )
+        } catch (error) {
+          log.error("MCP tool execution failed", {
+            tool: mcpTool.name,
+            error: error instanceof Error ? error.message : String(error),
+          })
+          return {
+            content: [
+              {
+                type: "text" as const,
+                text: `Error calling MCP tool "${mcpTool.name}": ${error instanceof Error ? error.message : String(error)}`,
+              },
+            ],
+            isError: true,
+          }
+        }
       },
     })
   }
@@ -300,7 +316,7 @@ export namespace MCP {
 
   async function fetchResourcesForClient(clientName: string, client: Client) {
     const resources = await client.listResources().catch((e) => {
-      log.error("failed to get prompts", { clientName, error: e.message })
+      log.error("failed to get resources", { clientName, error: e.message })
       return undefined
     })
 
@@ -368,6 +384,17 @@ export namespace MCP {
     let status: Status | undefined = undefined
 
     if (mcp.type === "remote") {
+      // Validate URL before attempting to connect
+      try {
+        new URL(mcp.url)
+      } catch {
+        log.error("invalid MCP URL", { key, url: mcp.url })
+        return {
+          mcpClient: undefined,
+          status: { status: "failed" as const, error: `Invalid URL: ${mcp.url}` },
+        }
+      }
+
       // OAuth is enabled by default for remote servers unless explicitly disabled with oauth: false
       const oauthDisabled = mcp.oauth === false
       const oauthConfig = typeof mcp.oauth === "object" ? mcp.oauth : undefined
@@ -1066,7 +1093,7 @@ export namespace MCP {
     const client = clientsSnapshot[clientName]
 
     if (!client) {
-      log.warn("client not found for prompt", {
+      log.warn("client not found for resource", {
         clientName: clientName,
       })
       return undefined
@@ -1077,7 +1104,7 @@ export namespace MCP {
         uri: resourceUri,
       })
       .catch((e) => {
-        log.error("failed to get prompt from MCP server", {
+        log.error("failed to read resource from MCP server", {
           clientName: clientName,
           resourceUri: resourceUri,
           error: e.message,

packages/cyberstrike/src/provider/error.ts

@@ -19,6 +19,11 @@ export namespace ProviderError {
     /context window exceeds limit/i, // MiniMax
     /exceeded model token limit/i, // Kimi For Coding, Moonshot
     /tokens in request more than max tokens allowed/i, // xAI / zAI
+    /input.?length exceeds/i, // Mistral
+    /request payload size exceeds/i, // Cerebras
+    /total number of tokens.*exceeded/i, // Cohere
+    /input tokens exceed/i, // Venice AI
+    /exceeds the model's maximum/i, // Together AI
     /context[_ ]length[_ ]exceeded/i, // Generic fallback
   ]
 
@@ -74,8 +79,12 @@ export namespace ProviderError {
 
       try {
         const body = JSON.parse(e.responseBody)
-        // try to extract common error message fields
-        const errMsg = body.message || body.error || body.error?.message
+        // try to extract common error message fields across providers
+        const errMsg =
+          body.message ||
+          (typeof body.error === "string" ? body.error : body.error?.message) ||
+          body.detail ||
+          body.errors?.[0]?.message
         if (errMsg && typeof errMsg === "string") {
           return `${msg}: ${errMsg}`
         }

packages/cyberstrike/src/provider/transform.ts

@@ -90,7 +90,7 @@ export namespace ProviderTransform {
     if (
       model.providerID === "mistral" ||
       model.api.id.toLowerCase().includes("mistral") ||
-      model.api.id.toLocaleLowerCase().includes("devstral")
+      model.api.id.toLowerCase().includes("devstral")
     ) {
       const result: ModelMessage[] = []
       for (let i = 0; i < msgs.length; i++) {
@@ -296,7 +296,7 @@ export namespace ProviderTransform {
     if (id.includes("gemini")) return 1.0
     if (id.includes("glm-4.6")) return 1.0
     if (id.includes("glm-4.7")) return 1.0
-    if (id.includes("minimax-m2")) return 1.0
+    if (id.includes("minimax-m2") || id.includes("minimax-m3")) return 1.0
     if (id.includes("kimi-k2")) {
       // kimi-k2-thinking & kimi-k2.5 && kimi-k2p5
       if (id.includes("thinking") || id.includes("k2.") || id.includes("k2p")) {
@@ -310,16 +310,16 @@ export namespace ProviderTransform {
   export function topP(model: Provider.Model) {
     const id = model.id.toLowerCase()
     if (id.includes("qwen")) return 1
-    if (id.includes("minimax-m2") || id.includes("kimi-k2.5") || id.includes("kimi-k2p5") || id.includes("gemini")) {
+    if (id.includes("minimax-m2") || id.includes("minimax-m3") || id.includes("kimi-k2.5") || id.includes("kimi-k2p5") || id.includes("gemini")) {
       return 0.95
     }
     return undefined
   }
 
   export function topK(model: Provider.Model) {
     const id = model.id.toLowerCase()
-    if (id.includes("minimax-m2")) {
-      if (id.includes("m2.1")) return 40
+    if (id.includes("minimax-m2") || id.includes("minimax-m3")) {
+      if (id.includes("m2.1") || id.includes("m3")) return 40
       return 20
     }
     if (id.includes("gemini")) return 64
@@ -1011,8 +1011,8 @@ export namespace ProviderTransform {
   }
 
   export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema | JSONSchema7): JSONSchema7 {
-    // Sanitize MCP tool schemas for OpenAI/Azure compatibility
-    if (model.api.npm === "@ai-sdk/openai" || model.api.npm === "@ai-sdk/azure") {
+    // Sanitize MCP tool schemas for OpenAI/Azure/Copilot compatibility
+    if (model.api.npm === "@ai-sdk/openai" || model.api.npm === "@ai-sdk/azure" || model.api.npm === "@ai-sdk/github-copilot") {
       schema = sanitizeOpenAISchema(schema) as JSONSchema7
     }
 
@@ -1059,12 +1059,25 @@ export namespace ProviderTransform {
           }
         }
 
+        // Gemini does not support type arrays like ["string", "null"].
+        // Flatten to the first non-null type, or fall back to "string".
+        if (Array.isArray(result.type)) {
+          const nonNull = (result.type as string[]).filter((t) => t !== "null")
+          result.type = nonNull[0] ?? "string"
+          result.nullable = true
+        }
+
         // Remove properties/required from non-object types (Gemini rejects these)
         if (result.type && result.type !== "object") {
           delete result.properties
           delete result.required
+          delete result.additionalProperties
         }
 
+        // Gemini does not support $defs / definitions
+        delete result.$defs
+        delete result.definitions
+
         return result
       }
 

packages/cyberstrike/src/session/compaction.ts

@@ -233,7 +233,8 @@ Rules:
       model,
     })
 
-    if (result === "continue" && input.auto) {
+    const config = await Config.get()
+    if (result === "continue" && input.auto && config.compaction?.auto !== false) {
       const continueMsg = await Session.updateMessage({
         id: Identifier.ascending("message"),
         role: "user",

packages/cyberstrike/src/session/processor.ts

@@ -254,6 +254,17 @@ export namespace SessionProcessor {
                   input.assistantMessage.finish = value.finishReason
                   input.assistantMessage.cost += usage.cost
                   input.assistantMessage.tokens = usage.tokens
+                  // Surface content-filter blocks so the user understands why
+                  // the response was empty or truncated
+                  if (value.finishReason === "content-filter") {
+                    await Session.updatePart({
+                      id: Identifier.ascending("part"),
+                      messageID: input.assistantMessage.id,
+                      sessionID: input.assistantMessage.sessionID,
+                      type: "text",
+                      text: "The model's response was blocked by a content filter. Try rephrasing your request.",
+                    })
+                  }
                   await Session.updatePart({
                     id: Identifier.ascending("part"),
                     reason: value.finishReason,

packages/cyberstrike/src/tool/grep.ts

@@ -37,7 +37,15 @@ export const GrepTool = Tool.define("grep", {
     await assertExternalDirectory(ctx, searchPath, { kind: "directory" })
 
     const rgPath = await Ripgrep.filepath()
-    const args = ["-nH", "--hidden", "--no-messages", "--field-match-separator=|", "--regexp", params.pattern]
+    const args = [
+      "-nH",
+      "--hidden",
+      "--follow",
+      "--no-messages",
+      "--field-match-separator=|",
+      "--regexp",
+      params.pattern,
+    ]
     if (params.include) {
       args.push("--glob", params.include)
     }