@bonginkan/maria 4.3.35 → 4.3.37

package/dist/bin/maria.cjs

@@ -26066,8 +26066,8 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@bonginkan/maria",
-      version: "4.3.35",
-      description: "\u{1F680} MARIA v4.3.35 - Enterprise AI Development Platform with identity system and character voice implementation. Features 74 production-ready commands with comprehensive fallback implementation, local LLM support, and zero external dependencies. Includes natural language coding, AI safety evaluation, intelligent evolution system, episodic memory with PII masking, and real-time monitoring dashboard. Built with TypeScript AST-powered code generation, OAuth2.0 + PKCE authentication, quantum-resistant cryptography, and enterprise-grade performance.",
+      version: "4.3.37",
+      description: "\u{1F680} MARIA v4.3.37 - Enterprise AI Development Platform with identity system and character voice implementation. Features 74 production-ready commands with comprehensive fallback implementation, local LLM support, and zero external dependencies. Includes natural language coding, AI safety evaluation, intelligent evolution system, episodic memory with PII masking, and real-time monitoring dashboard. Built with TypeScript AST-powered code generation, OAuth2.0 + PKCE authentication, quantum-resistant cryptography, and enterprise-grade performance.",
       keywords: [
         "ai",
         "cli",
@@ -28104,7 +28104,7 @@ var init_AuthenticationManager = __esm({
           const response = await fetch(`${this.apiBase}/api/user/profile`, {
             headers: {
               "Authorization": `Bearer ${tokens2.accessToken}`,
-              "User-Agent": `maria-cli/${process.env.CLI_VERSION || "4.3.35"}`
+              "User-Agent": `maria-cli/${process.env.CLI_VERSION || "4.3.37"}`
             }
           });
           if (response.status === 401) {
@@ -28714,6 +28714,17 @@ var init_withAuth = __esm({
     ];
   }
 });
+
+// src/services/cli-auth/api-client.ts
+var api_client_exports = {};
+__export(api_client_exports, {
+  ERR: () => ERR,
+  callApi: () => callApi,
+  callApiJson: () => callApiJson,
+  clientThrottle: () => clientThrottle,
+  streamApi: () => streamApi,
+  uploadFile: () => uploadFile
+});
 function getDeviceId() {
   if (!global.MARIA_DEVICE_ID) {
     global.MARIA_DEVICE_ID = v4_default();
@@ -28723,6 +28734,17 @@ function getDeviceId() {
 function getSessionId() {
   return global.MARIA_SESSION_ID;
 }
+function clientThrottle(endpoint) {
+  const now2 = Date.now();
+  const lastCall = rateLimitMap.get(endpoint) || 0;
+  const wait = MIN_GAP_MS - (now2 - lastCall);
+  if (wait > 0) {
+    const waitSeconds = Math.ceil(wait / 1e3);
+    console.log(chalk14__default.default.yellow(`\u23F1\uFE0F Rate limit: wait ${waitSeconds}s`));
+    throw { ...ERR.RATE, waitTime: waitSeconds };
+  }
+  rateLimitMap.set(endpoint, now2);
+}
 async function callApi(path64, init3 = {}) {
   const apiBase = process.env.MARIA_API_BASE || "https://api.maria-code.ai";
   const fullUrl = `${apiBase}${path64}`;
@@ -28736,7 +28758,7 @@ async function callApi(path64, init3 = {}) {
     "Authorization": `Bearer ${token}`,
     "X-Device-Id": getDeviceId(),
     "X-Session-Id": getSessionId() || "",
-    "User-Agent": `maria-cli/${process.env.CLI_VERSION || "4.3.35"}`,
+    "User-Agent": `maria-cli/${process.env.CLI_VERSION || "4.3.37"}`,
     "Content-Type": init3.headers?.["Content-Type"] || "application/json"
   });
   const doFetch = async (token) => {
@@ -28804,7 +28826,48 @@ async function callApiJson(path64, init3 = {}) {
   }
   return response.json();
 }
-var ERR;
+async function* streamApi(path64, init3 = {}) {
+  const response = await callApi(path64, {
+    ...init3,
+    headers: {
+      ...init3.headers,
+      "Accept": "text/event-stream"
+    }
+  });
+  if (!response.ok) {
+    throw new Error(`Stream error: ${response.status}`);
+  }
+  const reader = response.body?.getReader();
+  if (!reader) {
+    throw new Error("No response body");
+  }
+  const decoder = new TextDecoder();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      const chunk = decoder.decode(value, { stream: true });
+      yield chunk;
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
+async function uploadFile(path64, file, metadata5 = {}) {
+  const formData = new FormData();
+  formData.append("file", new Blob([file]));
+  Object.entries(metadata5).forEach(([key, value]) => {
+    formData.append(key, String(value));
+  });
+  return callApiJson(path64, {
+    method: "POST",
+    body: formData,
+    headers: {
+      // Don't set Content-Type, let browser set it with boundary
+    }
+  });
+}
+var ERR, rateLimitMap, MIN_GAP_MS;
 var init_api_client = __esm({
   "src/services/cli-auth/api-client.ts"() {
     init_AuthenticationManager();
@@ -28817,6 +28880,8 @@ var init_api_client = __esm({
       NETWORK: { msg: "\u{1F310} Network error, check connection", code: 1 },
       RATE: { msg: "\u23F3 Rate limited, retrying...", code: 1 }
     };
+    rateLimitMap = /* @__PURE__ */ new Map();
+    MIN_GAP_MS = 3e3;
   }
 });
 
@@ -28958,109 +29023,199 @@ var init_choice_memory = __esm({
   }
 });
 
-// src/services/interactive/triage-orchestrator.ts
-function getConfidenceBand(score) {
-  if (score >= TRIAGE_THRESHOLDS.high) {
-    return "high";
+// src/services/cli-auth/api-caller.ts
+var api_caller_exports = {};
+__export(api_caller_exports, {
+  RateLimitError: () => RateLimitError,
+  callAPI: () => callAPI,
+  executeAIProxy: () => executeAIProxy,
+  executeChat: () => executeChat,
+  executeCode: () => executeCode
+});
+async function callAPI(endpoint, options = {}) {
+  const tokens2 = await authManager2.getValidTokens();
+  if (!tokens2) {
+    throw new Error("Authentication required. Please run /login first.");
   }
-  if (score >= TRIAGE_THRESHOLDS.mid) {
-    return "mid";
+  const apiBase = process.env.MARIA_API_BASE || "https://api.maria-code.ai";
+  const url2 = `${apiBase}${endpoint}`;
+  const controller = new AbortController();
+  const defaultMs = 6e5;
+  const envMs = Number(process.env.MARIA_API_TIMEOUT_MS || process.env.MARIA_CODE_TIMEOUT_MS || defaultMs);
+  const timeoutMs = Number.isFinite(envMs) && envMs > 0 ? envMs : defaultMs;
+  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(url2, {
+      method: options.method || "GET",
+      headers: {
+        "Authorization": `Bearer ${tokens2.accessToken}`,
+        "Content-Type": "application/json",
+        ...options.headers
+      },
+      body: options.body ? JSON.stringify(options.body) : void 0,
+      // Note: fetch in Node doesn't accept 'agent' in our typing here; relying on global agent not necessary
+      signal: controller.signal
+    });
+    clearTimeout(timeoutId);
+    if (!response) {
+      throw new Error("\u{1F310} Network error, check connection");
+    }
+    if (response.status === 401) {
+      throw new Error("Session expired. Please run /login again.");
+    }
+    if (response.status === 402) {
+      const data2 = await response.json().catch(() => ({}));
+      throw new Error(`Quota exceeded: ${typeof data2?.message === "string" ? data2.message : "Please wait or /upgrade"}`);
+    }
+    if (response.status === 403) {
+      const data2 = await response.json().catch(() => ({}));
+      throw new Error(`Not available on Free plan: ${typeof data2?.message === "string" ? data2.message : "Run /upgrade"}`);
+    }
+    if (response.status === 429) {
+      const h2 = response.headers;
+      const ra = h2.get("Retry-After");
+      const reset = h2.get("RateLimit-Reset") || h2.get("X-RateLimit-Reset");
+      let waitSec = 3;
+      if (ra && /^\d+$/.test(ra)) {
+        waitSec = +ra;
+      } else if (ra) {
+        const t2 = Date.parse(ra);
+        if (!isNaN(t2)) waitSec = Math.max(1, Math.ceil((t2 - Date.now()) / 1e3));
+      } else if (reset) {
+        waitSec = Math.max(1, Math.ceil((+reset - Date.now()) / 1e3));
+      }
+      throw new RateLimitError(`\u23F1 Wait ${waitSec}s`, waitSec);
+    }
+    if (!response.ok) {
+      const data2 = await response.json().catch(() => ({}));
+      const msg = typeof data2?.error === "string" ? data2.error : `Request failed: ${response.statusText}`;
+      throw new Error(msg);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error2) {
+    clearTimeout(timeoutId);
+    const err = error2;
+    if (err && err.name === "AbortError") {
+      throw new Error("\u{1F310} Network error, check connection");
+    }
+    throw err;
   }
-  return "low";
 }
-async function triage(input3, ctx2 = {}) {
-  const question = (input3 || "").trim();
-  if (!question) {
-    return {
-      type: "simple",
-      confidence: 0.3,
-      rationale: ["empty"],
-      band: "low"
-    };
+async function executeChat(messages) {
+  const response = await callAPI("/v1/chat", {
+    method: "POST",
+    body: { messages }
+  });
+  return response;
+}
+async function executeCode(input3) {
+  const isOptions = typeof input3 === "object";
+  const prompt = isOptions ? input3.prompt : input3;
+  const provider = isOptions ? input3.provider : void 0;
+  const model = isOptions ? input3.model : void 0;
+  const attachments = isOptions ? input3.attachments : void 0;
+  const body = { prompt, taskType: "code" };
+  if (provider) body.provider = provider;
+  if (model) body.model = model;
+  if (attachments && attachments.length > 0) {
+    body.metadata = { attachments };
   }
-  const lower2 = question.toLowerCase();
-  const rationale = [];
-  if (ctx2.recentCommands?.length) {
-    const last = ctx2.recentCommands[ctx2.recentCommands.length - 1];
-    if (typeof last === "string" && last.startsWith("/code")) {
-      rationale.push("recent:/code");
-    }
+  const response = await callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body
+  });
+  if (response.data?.routedModel) {
+    response.routedModel = response.data.routedModel;
   }
-  if (IMAGE_REGEX.test(lower2)) {
-    rationale.push("match:image");
-    return {
-      type: "route-image",
-      confidence: 0.82,
-      rationale,
-      band: "high",
-      next: { route: "/image", args: [question] }
-    };
+  if (response.data?.content) {
+    response.output = response.data.content;
   }
-  if (VIDEO_REGEX.test(lower2)) {
-    rationale.push("match:video");
-    return {
-      type: "route-video",
-      confidence: 0.82,
-      rationale,
-      band: "high",
-      next: { route: "/video", args: [question] }
+  return response;
+}
+async function executeAIProxy(provider, model, messages, options) {
+  return callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body: { provider, model, messages, options }
+  });
+}
+var authManager2, RateLimitError;
+var init_api_caller = __esm({
+  "src/services/cli-auth/api-caller.ts"() {
+    init_AuthenticationManager();
+    new https__default.default.Agent({ keepAlive: true });
+    authManager2 = new AuthenticationManager();
+    RateLimitError = class extends Error {
+      constructor(message, retryAfter) {
+        super(message);
+        this.retryAfter = retryAfter;
+        this.name = "RateLimitError";
+      }
     };
   }
-  if (CODE_REGEX.test(lower2)) {
-    rationale.push("match:code");
-    const args2 = normalizeRouteArgs(["--plan-only", question]);
-    return {
-      type: "route-code",
-      confidence: 0.78,
-      rationale,
-      band: "high",
-      next: { route: "/code", args: args2 }
-    };
+});
+
+// src/services/intelligent-router/LlmTopLevelRouter.ts
+function extractFirstJson(text) {
+  const fence = /```json\r?\n([\s\S]*?)```/i.exec(text);
+  if (fence) return fence[1];
+  const start = text.indexOf("{");
+  const end = text.lastIndexOf("}");
+  if (start >= 0 && end > start) {
+    const cand = text.slice(start, end + 1);
+    try {
+      JSON.parse(cand);
+      return cand;
+    } catch {
+    }
   }
-  if (question.length > 220 || MULTI_SCOPE_REGEX.test(lower2) || /\b(ui|api|backend|database|テスト|設計|要件)\b/.test(lower2)) {
-    rationale.push("scope:multi");
-    const confidence = question.length > 220 ? 0.72 : 0.6;
-    return {
-      type: "complex",
-      confidence,
-      rationale,
-      band: getConfidenceBand(confidence)
-    };
+  return null;
+}
+async function mapInputToTopLevelCommand(input3) {
+  const system = [
+    "You are a router for the MARIA CLI.",
+    "Decide the best command for a single user input.",
+    "Allowed commands: /help, /image, /code, /video, /whoami, /login, /logout, /evaluate, chat.",
+    "Note that /image and /video are for generating them. If a path of a file is provided, you should double think why it's referenced (it may be for coding or chatting or other commands, regarding on the context).",
+    'Return JSON only with keys: { "command": string, "args"?: string[], "confidence": number }.',
+    "Select chat when the input is a general question or conversation rather than a specific slash command.",
+    "Make sure you set the confidence between 0 and 1.",
+    "Only include args if necessary to pass user content to the command. Do not explain."
+  ].join("\n");
+  const resp = await callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body: {
+      prompt: `${system}
+
+---
+
+${input3}`,
+      taskType: "routing"
+    }
+  });
+  const raw = (resp?.data?.content || resp?.output || "").trim();
+  const jsonText = extractFirstJson(raw) || raw;
+  let parsed = {};
+  try {
+    parsed = JSON.parse(jsonText);
+  } catch {
+    return null;
   }
-  if (question.length <= 140 && QUESTION_REGEX.test(lower2)) {
-    rationale.push("short+qa");
-    const confidence = question.length < 80 ? 0.72 : 0.62;
-    return {
-      type: "simple",
-      confidence,
-      rationale,
-      band: getConfidenceBand(confidence)
-    };
+  if (!parsed || typeof parsed.command !== "string") return null;
+  const cmd = parsed.command;
+  if (!["/help", "/image", "/code", "/video", "/whoami", "/login", "/logout", "/evaluate", "chat"].includes(cmd)) return null;
+  const out = { command: cmd };
+  if (Array.isArray(parsed.args)) {
+    out.args = parsed.args.filter((a) => typeof a === "string" && a.trim()).map((s2) => s2.trim());
   }
-  rationale.push("default:complex");
-  const fallbackConfidence = question.length > 80 ? 0.5 : 0.4;
-  return {
-    type: "complex",
-    confidence: fallbackConfidence,
-    rationale,
-    band: getConfidenceBand(fallbackConfidence)
-  };
-}
-function normalizeRouteArgs(args2 = []) {
-  return args2.map((arg) => arg.trim()).filter((arg) => arg.length > 0);
+  if (typeof parsed.confidence === "number") {
+    out.confidence = Math.max(0, Math.min(1, parsed.confidence));
+  }
+  return out;
 }
-var TRIAGE_THRESHOLDS, QUESTION_REGEX, CODE_REGEX, IMAGE_REGEX, VIDEO_REGEX, MULTI_SCOPE_REGEX;
-var init_triage_orchestrator = __esm({
-  "src/services/interactive/triage-orchestrator.ts"() {
-    TRIAGE_THRESHOLDS = Object.freeze({
-      high: 0.7,
-      mid: 0.35
-    });
-    QUESTION_REGEX = /(how|what|why|when|どの|どう|なぜ|いつ|とは)\b/i;
-    CODE_REGEX = /(create|generate|add|refactor|fix|test|route|build|component|migration|implement|実装|生成|追加|修正)/i;
-    IMAGE_REGEX = /(image|画像|svg|png|webp|thumbnail|illustration|アート|描いて)/i;
-    VIDEO_REGEX = /(video|動画|mp4|webm|frames|storyboard|アニメーション)/i;
-    MULTI_SCOPE_REGEX = /(\band\b|\balso\b|\s+,+\s+)/i;
+var init_LlmTopLevelRouter = __esm({
+  "src/services/intelligent-router/LlmTopLevelRouter.ts"() {
+    init_api_caller();
   }
 });
 
@@ -29282,7 +29437,7 @@ var init_unknown_command = __esm({
 });
 
 // src/slash-commands/types.ts
-var CommandError, ValidationError, PermissionError, RateLimitError;
+var CommandError, ValidationError, PermissionError, RateLimitError2;
 var init_types2 = __esm({
   "src/slash-commands/types.ts"() {
     CommandError = class extends Error {
@@ -29308,7 +29463,7 @@ var init_types2 = __esm({
         this.name = "PermissionError";
       }
     };
-    RateLimitError = class extends CommandError {
+    RateLimitError2 = class extends CommandError {
       constructor(message, retryAfter) {
         super(message, "RATE_LIMIT_ERROR", 429);
         this.retryAfter = retryAfter;
@@ -36605,8 +36760,7 @@ var init_registry = __esm({
             const { ChatContextService: ChatContextService3 } = await Promise.resolve().then(() => (init_chat_context_service(), chat_context_service_exports));
             const ctxSvc = ChatContextService3.getInstance();
             const usageLine = ctxSvc.getSessionUsageLine();
-            const suffix = `
-${usageLine}`;
+            const suffix = ``;
             result.message = (result.message || "").concat(suffix);
           } catch {
           }
@@ -36670,7 +36824,7 @@ ${usageLine}`;
                 }
               }
             } catch (innerError) {
-              logger.error(`Failed to load command from ${file}:`, error);
+              logger.error(`Failed to load command from ${file}:`, innerError);
             }
           }
           this.initialized = true;
@@ -36707,8 +36861,8 @@ ${usageLine}`;
             try {
               return await next();
             } catch (innerError) {
-              logger.error(`Command ${command.name} failed:`, error);
-              throw error;
+              logger.error(`Command ${command.name} failed:`, innerError);
+              throw innerError;
             }
           }
         });
@@ -37645,6 +37799,7 @@ var init_clear_command = __esm({
     init_telemetry_helper();
     init_subscription_manager();
     init_terminal();
+    init_chat_context_service();
     ClearCommand = class extends BaseCommand {
       name = "clear";
       category = "conversation";
@@ -37661,34 +37816,46 @@ var init_clear_command = __esm({
       async execute(args2, context2) {
         const startTime = Date.now();
         try {
+          let mode = "session";
+          const idx = Array.isArray(args2.raw) ? args2.raw.indexOf("--mode") : -1;
+          if (idx >= 0) {
+            const val = String(args2.raw[idx + 1] || "").toLowerCase();
+            if (val === "display" || val === "session" || val === "all") mode = val;
+          }
           clearTerminal();
-          if (context2.session) {
-            if (context2.session.conversationHistory) {
-              context2.session.conversationHistory = [];
-            }
-            if (context2.session.context) {
-              context2.session.context = {};
-            }
-            if (context2.session.messages) {
-              context2.session.messages = [];
-            }
+          const chat = ChatContextService.getInstance();
+          if (mode === "display") {
+            chat.clearContext({ soft: true });
+          } else {
+            chat.clearContext();
           }
+          const quotaLeft = (() => {
+            const rec = context2;
+            const v = rec && typeof rec["quotaLeft"] === "number" ? rec["quotaLeft"] : 999;
+            return v;
+          })();
           await trackCommand({
             cmd: "clear",
             status: "success",
             latencyMs: Date.now() - startTime,
-            plan: getUserPlan(),
-            quotaLeft: context2.quotaLeft || 999
+            plan: await getUserPlan(),
+            quotaLeft
           });
-          const message = chalk14__default.default.green("\u2705 Cleared") + chalk14__default.default.gray(" \xB7 context reset");
-          return this.success(withQuotaFooter(message, context2.quotaLeft));
+          const suffix = mode === "display" ? "display only" : "context reset";
+          const message = chalk14__default.default.green("\u2705 Cleared") + chalk14__default.default.gray(` \xB7 ${suffix}`);
+          return this.success(withQuotaFooter(message, quotaLeft));
         } catch (error2) {
+          const quotaLeft = (() => {
+            const rec = context2;
+            const v = rec && typeof rec["quotaLeft"] === "number" ? rec["quotaLeft"] : 999;
+            return v;
+          })();
           await trackCommand({
             cmd: "clear",
             status: "error",
             latencyMs: Date.now() - startTime,
-            plan: getUserPlan(),
-            quotaLeft: context2.quotaLeft || 999
+            plan: await getUserPlan(),
+            quotaLeft
           });
           clearTerminal();
           return this.success(chalk14__default.default.green("\u2705 Cleared"));
@@ -37738,7 +37905,7 @@ var init_clear_auto_command = __esm({
           const args2 = mode === "display" ? ["--mode", "display"] : [];
           const res = await commandRegistry2.execute("/clear", args2, context2);
           const line = ctx2.getSessionUsageLine();
-          const banner = `Auto clear mode: ${mode}  \xB7  ${line}`;
+          const banner = `Auto clear mode: ${mode}`;
           if (res?.success) {
             return this.success(`${banner}
 ${res.message || ""}`.trim());
@@ -38404,6 +38571,69 @@ var init_ReadyCommandsService = __esm({
   }
 });
 
+// src/services/help/HelpArgumentInference.ts
+function extractFirstJson2(text) {
+  const fence = /```json\r?\n([\s\S]*?)```/i.exec(text);
+  if (fence) return fence[1];
+  const start = text.indexOf("{");
+  const end = text.lastIndexOf("}");
+  if (start >= 0 && end > start) {
+    const cand = text.slice(start, end + 1);
+    try {
+      JSON.parse(cand);
+      return cand;
+    } catch {
+    }
+  }
+  return null;
+}
+async function inferHelpTarget(rawText, allowedCommands) {
+  const allowList = allowedCommands.filter((n) => typeof n === "string" && n.trim()).map((n) => n.trim()).slice(0, 200);
+  const system = [
+    "You decide which help to show for the MARIA CLI.",
+    'Allowed results: { target: "general" } or { target: "command", commandName: <one of allowed> }.',
+    'Return JSON only with keys: { "target": "general"|"command", "commandName"?: string, "confidence": number }.',
+    "If the user asks about a specific command (by name or description), select that command. Otherwise choose general.",
+    "Use confidence between 0 and 1. Do not explain."
+  ].join("\n");
+  const user = [
+    "User input:",
+    rawText || "(empty)",
+    "",
+    "Allowed command names:",
+    allowList.join(", ")
+  ].join("\n");
+  const resp = await callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body: {
+      prompt: `${system}
+
+---
+
+${user}`,
+      taskType: "help"
+    }
+  });
+  const raw = (resp?.data?.content || resp?.output || "").trim();
+  const jsonText = extractFirstJson2(raw) || raw;
+  let parsed = {};
+  try {
+    parsed = JSON.parse(jsonText);
+  } catch {
+    return {};
+  }
+  const out = {};
+  if (parsed.target === "general" || parsed.target === "command") out.target = parsed.target;
+  if (typeof parsed.commandName === "string" && parsed.commandName.trim()) out.commandName = parsed.commandName.trim();
+  if (typeof parsed.confidence === "number") out.confidence = Math.max(0, Math.min(1, parsed.confidence));
+  return out;
+}
+var init_HelpArgumentInference = __esm({
+  "src/services/help/HelpArgumentInference.ts"() {
+    init_api_caller();
+  }
+});
+
 // src/slash-commands/categories/core/handlers/HelpCommand.ts
 var HelpCommand_exports = {};
 __export(HelpCommand_exports, {
@@ -38417,6 +38647,8 @@ var init_HelpCommand = __esm({
     init_ReadyCommandsService();
     init_telemetry_helper();
     init_subscription_manager();
+    init_HelpArgumentInference();
+    init_animations();
     HelpCommand = class extends BaseCommand {
       name = "help";
       category = "core";
@@ -38465,6 +38697,26 @@ var init_HelpCommand = __esm({
             await this.trackSuccess(startTime, context2);
             return result2;
           }
+          const text = (args2.raw || []).join(" ").trim();
+          if (text) {
+            const commandsList = (await this.readyService.getAllReadyCommands()).map((c) => c.name);
+            const spin = new ProcessAnimation();
+            spin.start();
+            try {
+              const inferred = await inferHelpTarget(text, commandsList);
+              const threshold = Number(process.env.MARIA_HELP_CONFIDENCE || "0.7");
+              if (inferred && inferred.target === "command" && inferred.commandName && (inferred.confidence ?? 1) >= threshold) {
+                const result2 = await this.showCommandHelp(inferred.commandName);
+                await this.trackSuccess(startTime, context2);
+                return result2;
+              }
+            } finally {
+              try {
+                spin.stop();
+              } catch {
+              }
+            }
+          }
           if (_positional.length > 0) {
             const commandName = _positional[0];
             if (commandName) {
@@ -38611,44 +38863,6 @@ var init_HelpCommand = __esm({
        * Show help for specific command
        */
       async showCommandHelp(commandName) {
-        if (commandName.replace(/^\//, "") === "code") {
-          const lines2 = [];
-          lines2.push("Usage: /code <request> [flags]");
-          lines2.push("");
-          lines2.push("Flags:");
-          lines2.push("  --plan-only|--sow        Show plan only (no writes)");
-          lines2.push("  --apply                  Apply plan (use with --yes for non-interactive)");
-          lines2.push("  --dry-run                No writes; render output and hints");
-          lines2.push("  --interactive            Approve interactively (a=all s=skip v=view d=diff q=cancel)");
-          lines2.push("  --yes                    Approve all (including overwrites)");
-          lines2.push("  --max-files N            Clamp number of files");
-          lines2.push("  --root DIR               Output root directory");
-          lines2.push("  --rollback on|off        Rollback on failure (default on)");
-          lines2.push("  --output names|summary|detail");
-          lines2.push("  --no-code                Hide code blocks entirely");
-          lines2.push("  --preview-lines N        Show head of code in detail mode");
-          lines2.push("  --git-guard on|off       Check clean git tree before apply (CI default on)");
-          lines2.push("  --git-commit on|off      Create a single git commit after apply");
-          lines2.push("  --git-branch <name>      Create/switch branch before committing");
-          lines2.push("  --git-tag <name>         Create an annotated tag after committing");
-          lines2.push("  --git-tag-prefix <pfx>   Use standardized tag when --git-tag auto: <pfx><YYYYMMDD>-<shortsha>");
-          lines2.push("  --git-push on|off        Push commit and tag to remote");
-          lines2.push("  --git-push-remote <name> Remote name for push (default origin)");
-          lines2.push("  --allow-dotfiles         Allow writing dotfiles (default deny)");
-          lines2.push("  --confirm-overwrites <globs>");
-          lines2.push("");
-          lines2.push("Tips:");
-          lines2.push('  HINT: Try /code --plan-only "your request" before applying changes');
-          lines2.push("  Recipes:");
-          lines2.push('   \u2022 Plan only: /code --plan-only "create auth form + API"');
-          lines2.push('   \u2022 Apply with limit: /code --apply --yes --max-files 5 "react + test"');
-          lines2.push('   \u2022 Interactive: /code --interactive --output detail --preview-lines 20 "routes + guards"');
-          lines2.push("   \u2022 Apply + branch + auto tag + push:");
-          lines2.push("     /code --apply --yes --git-guard on --git-commit on \\");
-          lines2.push("           --git-branch feature/code-plan --git-tag auto --git-tag-prefix code-plan- \\");
-          lines2.push('           --git-push on --git-push-remote origin "implement auth + tests"');
-          return this.success(lines2.join("\n"));
-        }
         const command = await this.readyService.getCommand(commandName);
         if (!command) {
           const searchResults = await this.readyService.searchCommands(commandName, 3);
@@ -47421,6 +47635,201 @@ var init_types4 = __esm({
     ];
   }
 });
+
+// src/services/media-orchestrator/NLInference.ts
+function clampSize(size) {
+  const clamp = (n) => Math.min(2048, Math.max(256, Math.floor(n)));
+  return [clamp(size[0]), clamp(size[1])];
+}
+function parseExplicitSize(text) {
+  const m2 = /(\d{2,4})\s*[x×]\s*(\d{2,4})/i.exec(text);
+  if (m2) {
+    const w = Number(m2[1]);
+    const h2 = Number(m2[2]);
+    if (Number.isFinite(w) && Number.isFinite(h2)) return clampSize([w, h2]);
+  }
+  const p = /(2160|1440|1080|720)\s*p\b/i.exec(text);
+  if (p) {
+    const h2 = Number(p[1]);
+    const map = {
+      2160: [3840, 2160],
+      1440: [2560, 1440],
+      1080: [1920, 1080],
+      720: [1280, 720]
+    };
+    return clampSize(map[h2]);
+  }
+  return void 0;
+}
+function parseAspect(text) {
+  if (/16\s*:\s*9/.test(text)) return "16:9";
+  if (/9\s*:\s*16/.test(text)) return "9:16";
+  if (/1\s*:\s*1/.test(text)) return "1:1";
+  if (/(wide|landscape)/i.test(text)) return "16:9";
+  if (/(tall|portrait)/i.test(text)) return "9:16";
+  if (/(landscape|横長|横向き)/i.test(text)) return "16:9";
+  if (/(portrait|縦長|縦向き)/i.test(text)) return "9:16";
+  if (/(square|正方形|スクエア)/i.test(text)) return "1:1";
+  return void 0;
+}
+function deriveSizeFromAspect(aspect, base) {
+  const side = 1024;
+  if (aspect === "1:1") return clampSize([side, side]);
+  if (aspect === "16:9") {
+    const w2 = Math.max(side, 1280);
+    const h3 = Math.round(w2 / 16 * 9);
+    return clampSize([w2, h3]);
+  }
+  const h2 = Math.max(side, 1920);
+  const w = Math.round(h2 / 16 * 9);
+  return clampSize([w, h2]);
+}
+function parse4KHints(text, aspect) {
+  if (/(\b4k\b|uhd|超高精細|超高解像度)/i.test(text)) {
+    if (aspect === "1:1" || /square|正方形|スクエア/i.test(text)) return clampSize([2048, 2048]);
+    if (aspect === "9:16" || /(portrait|縦長|縦向き)/i.test(text)) return clampSize([1152, 2048]);
+    return clampSize([2048, 1152]);
+  }
+  if (/(2k|1440p)/i.test(text)) {
+    if (aspect === "1:1") return clampSize([1440, 1440]);
+    if (aspect === "9:16") return clampSize([810, 1440]);
+    return clampSize([1440, 810]);
+  }
+  return void 0;
+}
+function parseUseCaseSize(text, aspectHint) {
+  if (/(icon|アイコン)/i.test(text)) return [512, 512];
+  if (/(thumbnail|サムネ)/i.test(text)) return [1280, 720];
+  if (/(instagram\s*story|インスタ\s*ストーリー)/i.test(text)) return [1080, 1920];
+  if (/(instagram\s*post|インスタ\s*投稿)/i.test(text)) return [1080, 1080];
+  if (/(twitter\s*header|x\s*header)/i.test(text)) return [1500, 500];
+  if (/(hd|フルhd)/i.test(text)) return [1920, 1080];
+  if (aspectHint) return deriveSizeFromAspect(aspectHint);
+  if (/(portrait|縦長|縦向き)/i.test(text)) return deriveSizeFromAspect("9:16");
+  if (/(landscape|横長|横向き)/i.test(text)) return deriveSizeFromAspect("16:9");
+  if (/(square|正方形|スクエア)/i.test(text)) return [1024, 1024];
+  return void 0;
+}
+function inferFormat(text) {
+  if (/(png|透過|alpha)/i.test(text)) return "png";
+  if (/(webp|ウェブピー)/i.test(text)) return "webp";
+  if (/(jpg|jpeg|写真|photo)/i.test(text)) return "jpg";
+  return void 0;
+}
+function inferImageOptionsFromText(text) {
+  const lower2 = text.toLowerCase();
+  const aspect = parseAspect(lower2);
+  const exp = parseExplicitSize(lower2);
+  const k4 = parse4KHints(lower2, aspect);
+  const use = parseUseCaseSize(lower2, aspect);
+  const size = exp || k4 || use;
+  const format = inferFormat(lower2);
+  const out = {};
+  if (size) out.size = size;
+  if (format) out.format = format;
+  return out;
+}
+var init_NLInference = __esm({
+  "src/services/media-orchestrator/NLInference.ts"() {
+  }
+});
+
+// src/services/media-orchestrator/ImageArgumentInference.ts
+function extractFirstJson3(text) {
+  const fence = /```json\r?\n([\s\S]*?)```/i.exec(text);
+  if (fence) return fence[1];
+  const fencePlain = /```\s*\r?\n([\s\S]*?)```/i.exec(text);
+  if (fencePlain) {
+    try {
+      JSON.parse(fencePlain[1]);
+      return fencePlain[1];
+    } catch {
+    }
+  }
+  const start = text.indexOf("{");
+  const end = text.lastIndexOf("}");
+  if (start >= 0 && end > start) {
+    const cand = text.slice(start, end + 1);
+    try {
+      JSON.parse(cand);
+      return cand;
+    } catch {
+    }
+  }
+  return null;
+}
+function clampSize2(size) {
+  const clamp = (n) => Math.min(4096, Math.max(256, Math.floor(n)));
+  return [clamp(size[0]), clamp(size[1])];
+}
+function parseSizeAny(x2) {
+  if (typeof x2 === "string") {
+    const m2 = /^\s*(\d{2,4})x(\d{2,4})\s*$/i.exec(x2);
+    if (m2) return clampSize2([Number(m2[1]), Number(m2[2])]);
+  }
+  if (x2 && typeof x2 === "object") {
+    const any = x2;
+    const w = Number(any.width ?? any.w);
+    const h2 = Number(any.height ?? any.h);
+    if (Number.isFinite(w) && Number.isFinite(h2)) return clampSize2([w, h2]);
+  }
+  return void 0;
+}
+function sanitizeFormat(fmt) {
+  if (typeof fmt !== "string") return void 0;
+  const f3 = fmt.toLowerCase();
+  const mapped = f3 === "jpeg" ? "jpg" : f3;
+  return ["png", "webp", "jpg"].includes(mapped) ? mapped : void 0;
+}
+async function inferImageArgsLLM(promptText) {
+  const system = [
+    "You extract image generation options from user natural language.",
+    'Return JSON only with keys: { "size"?: "WIDTHxHEIGHT", "format"?: "png|webp|jpg", "count"?: number }.',
+    'Only include "count" if the user explicitly specifies the number of images (e.g., "2 images"). Otherwise omit (default is 1).',
+    'Only include "format" if the user explicitly specifies a format (e.g., "png", "webp", "jpg", transparency). Otherwise omit (default is png).',
+    'Size must be a single string "WIDTHxHEIGHT". If the user implies aspect/resolution (e.g., "wide"/"landscape" => 16:9, "tall"/"portrait" => 9:16, "square" => 1:1, or 4K/UHD/1080p/720p), select a reasonable resolution within 256..4096 per side and return it as "WIDTHxHEIGHT".',
+    "If size is not specified or implied, omit it (default is 1024x1024).",
+    "Do NOT include model or keepExif unless the user explicitly specified them; otherwise omit.",
+    "Do not include any explanation text; JSON only."
+  ].join("\n");
+  const user = promptText;
+  const response = await callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body: {
+      prompt: `${system}
+
+---
+
+${user}`,
+      taskType: "media"
+    }
+  });
+  const raw = (response?.data?.content || response?.output || "").trim();
+  const jsonText = extractFirstJson3(raw) || raw;
+  let parsed;
+  try {
+    parsed = JSON.parse(jsonText);
+  } catch {
+    return {};
+  }
+  const out = {};
+  const size = parseSizeAny(parsed?.size);
+  if (size) out.size = size;
+  const fmt = sanitizeFormat(parsed?.format);
+  if (fmt) out.format = fmt;
+  if (Number.isFinite(Number(parsed?.count))) {
+    const n = Math.max(1, Math.min(8, Math.floor(Number(parsed.count))));
+    out.count = n;
+  }
+  if (typeof parsed?.model === "string" && parsed.model.trim()) out.model = String(parsed.model).trim();
+  if (typeof parsed?.keepExif === "boolean") out.keepExif = parsed.keepExif;
+  return out;
+}
+var init_ImageArgumentInference = __esm({
+  "src/services/media-orchestrator/ImageArgumentInference.ts"() {
+    init_api_caller();
+  }
+});
 function parseSize(value) {
   const m2 = /^\s*(\d{2,4})x(\d{2,4})\s*$/i.exec(value || "");
   if (!m2) throw new Error(`invalid size: ${value}`);
@@ -47453,6 +47862,8 @@ function normalizeImageArgs(raw, root) {
     planOnly: false,
     dryRun: false
   };
+  let explicitSize = false;
+  let explicitFormat = false;
   while (args2.length) {
     const x2 = args2.shift();
     if (!x2.startsWith("--")) continue;
@@ -47461,12 +47872,14 @@ function normalizeImageArgs(raw, root) {
     switch (k) {
       case "size":
         out.size = parseSize(String(v));
+        explicitSize = true;
         break;
       case "format": {
         const rawFmt = String(v).toLowerCase();
         const mapped = rawFmt === "jpeg" ? "jpg" : rawFmt;
         if (!["png", "webp", "jpg"].includes(mapped)) throw new Error("invalid format");
         out.format = mapped;
+        explicitFormat = true;
         break;
       }
       case "count": {
@@ -47507,6 +47920,21 @@ function normalizeImageArgs(raw, root) {
         break;
     }
   }
+  try {
+    const inferred = inferImageOptionsFromText(prompt);
+    if (!explicitSize && inferred.size) out.size = inferred.size;
+    if (!explicitFormat && inferred.format) out.format = inferred.format;
+  } catch {
+  }
+  try {
+    if (String(process.env.MARIA_USE_LLM_INFER || "1") === "1" && (!explicitSize || !explicitFormat)) {
+      global.__MARIA_IMAGE_LLM_INFER__ = async () => {
+        const llm = await inferImageArgsLLM(prompt);
+        return llm;
+      };
+    }
+  } catch {
+  }
   const pixels = out.size[0] * out.size[1] * out.count;
   if (pixels > (out.budgetPixels || 0)) throw new Error("budget exceeded");
   if (!out.apply && !out.planOnly && !out.dryRun) {
@@ -47539,7 +47967,8 @@ function normalizeVideoArgs(raw, root) {
     retry: 2,
     apply: false,
     planOnly: false,
-    dryRun: false
+    dryRun: false,
+    aspect: "16:9"
   };
   while (args2.length) {
     const x2 = args2.shift();
@@ -47553,9 +47982,43 @@ function normalizeVideoArgs(raw, root) {
       case "fps":
         out.fps = clampInt(v, 1, 60, "fps");
         break;
-      case "res":
-        out.size = parseSize(String(v));
+      case "size": {
+        const sz = parseSize(String(v));
+        out.size = sz;
+        out.aspect = sz[0] >= sz[1] ? "16:9" : "9:16";
         break;
+      }
+      case "res": {
+        const sv = String(v).toLowerCase().replace(/p$/, "");
+        if (/^\d+x\d+$/i.test(String(v))) {
+          out.size = parseSize(String(v));
+          out.aspect = out.size[0] >= out.size[1] ? "16:9" : "9:16";
+        } else if (sv === "720") {
+          out.size = out.aspect === "9:16" ? [720, 1280] : [1280, 720];
+        } else if (sv === "1080") {
+          out.size = out.aspect === "9:16" ? [1080, 1920] : [1920, 1080];
+        } else {
+          throw new Error("invalid res (use 720|1080 or WIDTHxHEIGHT)");
+        }
+        break;
+      }
+      case "aspect": {
+        const a = String(v);
+        if (a !== "16:9" && a !== "9:16") throw new Error("invalid aspect (use 16:9|9:16)");
+        out.aspect = a;
+        const [w, h2] = out.size;
+        if (w === 1280 && h2 === 720 || w === 720 && h2 === 1280 || w === 1920 && h2 === 1080 || w === 1080 && h2 === 1920) {
+          if (a === "9:16") {
+            if (h2 === 720) out.size = [720, 1280];
+            else if (h2 === 1080) out.size = [1080, 1920];
+          } else {
+            if (w === 720) out.size = [1280, 720];
+            else if (w === 1080) out.size = [1920, 1080];
+            if (w === 1080 && h2 === 1920) out.size = [1920, 1080];
+          }
+        }
+        break;
+      }
       case "format":
         if (!["mp4", "webm"].includes(String(v))) throw new Error("invalid format");
         out.format = v;
@@ -47591,7 +48054,11 @@ function normalizeVideoArgs(raw, root) {
   }
   const caps = chooseCaps("video", out.model);
   if (caps?.maxVideoSize) {
-    if (out.size[0] > caps.maxVideoSize[0] || out.size[1] > caps.maxVideoSize[1]) throw new Error("resolution exceeds model capability");
+    const reqMax = Math.max(out.size[0], out.size[1]);
+    const reqMin = Math.min(out.size[0], out.size[1]);
+    const capMax = Math.max(caps.maxVideoSize[0], caps.maxVideoSize[1]);
+    const capMin = Math.min(caps.maxVideoSize[0], caps.maxVideoSize[1]);
+    if (reqMax > capMax || reqMin > capMin) throw new Error("resolution exceeds model capability");
   }
   if (caps?.maxDuration && out.duration > caps.maxDuration) throw new Error("duration exceeds model capability");
   if (caps?.maxFps && out.fps > caps.maxFps) throw new Error("fps exceeds model capability");
@@ -47619,6 +48086,8 @@ function sanitizeOut(outDir, root) {
 var init_Normalizer = __esm({
   "src/services/media-orchestrator/Normalizer.ts"() {
     init_types4();
+    init_NLInference();
+    init_ImageArgumentInference();
   }
 });
 function ensureDirSync(p) {
@@ -48480,6 +48949,19 @@ var init_image_command = __esm({
           const spinner = new ProcessAnimation();
           spinner.start();
           try {
+            try {
+              const hook = global.__MARIA_IMAGE_LLM_INFER__;
+              if (hook) {
+                const llm = await hook();
+                if (llm) {
+                  if (llm.size && (!Array.isArray(cli.size) || cli.size.length !== 2)) cli.size = llm.size;
+                  if (llm.size && Array.isArray(llm.size)) cli.size = llm.size;
+                  if (llm.format) cli.format = llm.format;
+                  if (Number.isFinite(Number(llm.count))) cli.count = Math.max(1, Math.min(8, Math.floor(Number(llm.count))));
+                }
+              }
+            } catch {
+            }
             const useRemote = String(process.env.MARIA_USE_REMOTE_MEDIA || "").toLowerCase() === "1" && await authManager.isAuthenticated();
             if (useRemote) {
               try {
@@ -48791,12 +49273,18 @@ async function runVideoPipeline(params2, opts) {
       const { GoogleGenAI } = __require("@google/genai");
       const ai2 = new GoogleGenAI({ apiKey });
       const modelName = params2.model || "veo-3.0-generate-001";
-      const aspectRatio = params2.size[0] >= params2.size[1] ? "16:9" : "9:16";
+      const aspectRatio = "16:9";
+      const resolution = Math.max(params2.size[0], params2.size[1]) >= 1920 ? "1080p" : "720p";
       const effectiveDuration = 8;
       let operation = await ai2.models.generateVideos({
         model: modelName,
         prompt: String(params2.prompt),
-        config: { aspectRatio, durationSeconds: effectiveDuration, frameRate: params2.fps }
+        config: {
+          aspectRatio,
+          /* resolution: resolution, */
+          durationSeconds: effectiveDuration,
+          frameRate: params2.fps
+        }
       });
       const pollStart = Date.now();
       const maxWaitMs = 6 * 60 * 1e3;
@@ -48948,7 +49436,7 @@ var init_video_command = __esm({
       category = "media";
       description = "Generate videos using Gemini (frames fallback when mux unavailable)";
       aliases = [];
-      usage = '/video "prompt" [--duration 8] [--fps 24] [--res 1280x720] [--format mp4|webm] [--model gemini-...] [--seed N] [--out dir] [--apply|--plan-only|--dry-run] [--concurrency N] [--retry N]';
+      usage = '/video "prompt" [--duration 8] [--fps 24] [--aspect 16:9|9:16] [--res 720|1080] [--format mp4|webm] [--model gemini-...] [--seed N] [--out dir] [--apply|--plan-only|--dry-run] [--concurrency N] [--retry N]';
       examples = [
         { input: '/video "product demo" --duration 8 --fps 24 --res 1280x720 --apply', description: "Generate a short demo video" }
       ];
@@ -48969,11 +49457,15 @@ var init_video_command = __esm({
             const useRemote = String(process.env.MARIA_USE_REMOTE_MEDIA || "").toLowerCase() === "1" && await authManager.isAuthenticated();
             if (useRemote) {
               try {
+                const isPortrait = cli.size[1] > cli.size[0];
+                const maxEdge = Math.max(cli.size[0], cli.size[1]);
+                const discrete = maxEdge >= 1920 ? "1080" : maxEdge >= 1280 ? "720" : void 0;
                 const body = {
                   prompt: cli.prompt,
                   duration: cli.duration,
                   fps: cli.fps,
-                  res: `${cli.size[0]}x${cli.size[1]}`,
+                  res: discrete ? discrete : `${cli.size[0]}x${cli.size[1]}`,
+                  aspect: isPortrait ? "9:16" : "16:9",
                   format: cli.format,
                   model: cli.model,
                   seed: cli.seed
@@ -50769,7 +51261,7 @@ var init_about_command = __esm({
       async execute(args2, context2) {
         const output3 = [];
         output3.push("");
-        output3.push(chalk14__default.default.cyan.bold("\u{1F916} About MARIA v4.3.35"));
+        output3.push(chalk14__default.default.cyan.bold("\u{1F916} About MARIA v4.3.37"));
         output3.push(chalk14__default.default.gray("\u2550".repeat(40)));
         output3.push("");
         output3.push(chalk14__default.default.white.bold("MARIA - Minimal API, Maximum Power"));
@@ -54158,6 +54650,62 @@ var init_code_utils = __esm({
     ]);
   }
 });
+
+// src/services/code-orchestrator/ArgumentInference.ts
+function extractFirstJson4(text) {
+  const fence = /```json\r?\n([\s\S]*?)```/i.exec(text);
+  if (fence) return fence[1];
+  const start = text.indexOf("{");
+  const end = text.lastIndexOf("}");
+  if (start >= 0 && end > start) {
+    const cand = text.slice(start, end + 1);
+    try {
+      JSON.parse(cand);
+      return cand;
+    } catch {
+    }
+  }
+  return null;
+}
+async function inferCodeArgs(rawText) {
+  const system = [
+    "You extract structured options for a code command.",
+    'Return JSON only with keys: { "planOnly"?: boolean, "dryRun"?: boolean, "output"?: "names"|"summary"|"detail", "previewLines"?: number }.',
+    "Decide from the user text whether planOnly or dryRun should be true. Do not explain.",
+    "Only include output if the user requests preview detail or summary mode. Only include previewLines if a specific number of lines is requested."
+  ].join("\n");
+  const resp = await callAPI("/v1/ai-proxy", {
+    method: "POST",
+    body: {
+      prompt: `${system}
+
+---
+
+${rawText}`,
+      taskType: "code"
+    }
+  });
+  const raw = (resp?.data?.content || resp?.output || "").trim();
+  const jsonText = extractFirstJson4(raw) || raw;
+  let parsed = {};
+  try {
+    parsed = JSON.parse(jsonText);
+  } catch {
+    return {};
+  }
+  const out = {};
+  if (typeof parsed.planOnly === "boolean") out.planOnly = parsed.planOnly;
+  if (typeof parsed.dryRun === "boolean") out.dryRun = parsed.dryRun;
+  if (typeof parsed.output === "string" && (parsed.output === "names" || parsed.output === "summary" || parsed.output === "detail")) out.output = parsed.output;
+  if (typeof parsed.previewLines === "number" && Number.isFinite(parsed.previewLines) && parsed.previewLines > 0) out.previewLines = Math.min(2e3, Math.floor(parsed.previewLines));
+  if (out.planOnly) out.dryRun = false;
+  return out;
+}
+var init_ArgumentInference = __esm({
+  "src/services/code-orchestrator/ArgumentInference.ts"() {
+    init_api_caller();
+  }
+});
 async function scanRepo(cwd2) {
   if (_cache && _cache.root === cwd2) return _cache;
   const root = cwd2;
@@ -54432,7 +54980,8 @@ function formatPlan(summary, opts) {
   if (opts.requestText && opts.requestText.trim().length > 0) {
     lines.push(opts.requestText.trim(), "");
   }
-  lines.push(`Modified Artifacts (${summary.planned} files):`);
+  const headerLabel = opts.planView ? "Planned Artifacts" : "Modified Artifacts";
+  lines.push(`${headerLabel} (${summary.planned} files):`);
   const warnMap = buildPerFileWarnings(summary.files, opts.validated);
   const skippedSet = new Set(opts.validated?.skipped || []);
   for (const f3 of summary.files) {
@@ -54457,18 +55006,20 @@ function formatPlan(summary, opts) {
       lines.push(diff, "");
     }
   }
-  const created = summary.files.filter((f3) => f3.action === "create").length;
-  const modified = summary.files.filter((f3) => f3.action === "modify").length;
-  const skipped = opts.validated?.skipped?.length || 0;
-  const okPhrase = created > 0 ? `${created + modified} files created/modified` : `${modified} files modified`;
-  lines.push(`OK: ${okPhrase}`);
-  if (skipped > 0) lines.push(`WARN: ${skipped} file${skipped > 1 ? "s" : ""} skipped`);
-  lines.push("Next steps:");
-  if (large) {
-    lines.push('- Large output \u2013 previews suppressed. Use --output diff or press "d" in interactive mode');
+  if (!opts.planView) {
+    const created = summary.files.filter((f3) => f3.action === "create").length;
+    const modified = summary.files.filter((f3) => f3.action === "modify").length;
+    const skipped = opts.validated?.skipped?.length || 0;
+    const okPhrase = created > 0 ? `${created + modified} files created/modified` : `${modified} files modified`;
+    lines.push(`OK: ${okPhrase}`);
+    if (skipped > 0) lines.push(`WARN: ${skipped} file${skipped > 1 ? "s" : ""} skipped`);
+    lines.push("Next steps:");
+    if (large) {
+      lines.push('- Large output \u2013 previews suppressed. Use --output diff or press "d" in interactive mode');
+    }
+    lines.push("- If this looks correct, commit the changes");
+    lines.push('- For a full diff: rerun with --output diff or press "d" in interactive mode');
   }
-  lines.push("- If this looks correct, commit the changes");
-  lines.push('- For a full diff: rerun with --output diff or press "d" in interactive mode');
   return lines.join("\n");
 }
 function okLine(text) {
@@ -54504,9 +55055,10 @@ function formatPlanAsDiff(files, opts) {
     bytesUsed += diffBytes;
     shownFiles++;
   }
-  if (files.length > shownFiles) {
+  const totalDiffTargets = files.filter((f3) => f3.action === "modify").length;
+  if (totalDiffTargets > shownFiles) {
     lines.push(`
-[${files.length - shownFiles} more file(s) omitted; re-run with --output diff --diff-lines ${budget.diffLines ?? 200}]`);
+[${totalDiffTargets - shownFiles} more file(s) omitted; re-run with --output diff --diff-lines ${budget.diffLines ?? 200}]`);
   }
   return lines.join("\n");
 }
@@ -54748,129 +55300,6 @@ var init_InteractiveController = __esm({
     init_OutputFormatter();
   }
 });
-
-// src/services/cli-auth/api-caller.ts
-var api_caller_exports = {};
-__export(api_caller_exports, {
-  RateLimitError: () => RateLimitError2,
-  callAPI: () => callAPI,
-  executeAIProxy: () => executeAIProxy,
-  executeChat: () => executeChat,
-  executeCode: () => executeCode
-});
-async function callAPI(endpoint, options = {}) {
-  const tokens2 = await authManager2.getValidTokens();
-  if (!tokens2) {
-    throw new Error("Authentication required. Please run /login first.");
-  }
-  const apiBase = process.env.MARIA_API_BASE || "https://api.maria-code.ai";
-  const url2 = `${apiBase}${endpoint}`;
-  const controller = new AbortController();
-  const defaultMs = 6e5;
-  const envMs = Number(process.env.MARIA_API_TIMEOUT_MS || process.env.MARIA_CODE_TIMEOUT_MS || defaultMs);
-  const timeoutMs = Number.isFinite(envMs) && envMs > 0 ? envMs : defaultMs;
-  const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const response = await fetch(url2, {
-      method: options.method || "GET",
-      headers: {
-        "Authorization": `Bearer ${tokens2.accessToken}`,
-        "Content-Type": "application/json",
-        ...options.headers
-      },
-      body: options.body ? JSON.stringify(options.body) : void 0,
-      agent,
-      // Use keep-alive agent
-      signal: controller.signal
-    });
-    clearTimeout(timeoutId);
-    if (!response) {
-      throw new Error("\u{1F310} Network error, check connection");
-    }
-    if (response.status === 401) {
-      throw new Error("Session expired. Please run /login again.");
-    }
-    if (response.status === 402) {
-      const data2 = await response.json().catch(() => ({}));
-      throw new Error(`Quota exceeded: ${data2.message || "Please wait or /upgrade"}`);
-    }
-    if (response.status === 403) {
-      const data2 = await response.json().catch(() => ({}));
-      throw new Error(`Not available on Free plan: ${data2.message || "Run /upgrade"}`);
-    }
-    if (response.status === 429) {
-      const h2 = response.headers;
-      const ra = h2.get("Retry-After");
-      const reset = h2.get("RateLimit-Reset") || h2.get("X-RateLimit-Reset");
-      let waitSec = 3;
-      if (ra && /^\d+$/.test(ra)) {
-        waitSec = +ra;
-      } else if (ra) {
-        const t2 = Date.parse(ra);
-        if (!isNaN(t2)) waitSec = Math.max(1, Math.ceil((t2 - Date.now()) / 1e3));
-      } else if (reset) {
-        waitSec = Math.max(1, Math.ceil((+reset - Date.now()) / 1e3));
-      }
-      throw new RateLimitError2(`\u23F1 Wait ${waitSec}s`, waitSec);
-    }
-    if (!response.ok) {
-      const data2 = await response.json().catch(() => ({}));
-      throw new Error(data2.error || `Request failed: ${response.statusText}`);
-    }
-    const data = await response.json();
-    return data;
-  } catch (error2) {
-    clearTimeout(timeoutId);
-    if (error2.name === "AbortError") {
-      throw new Error("\u{1F310} Network error, check connection");
-    }
-    throw error2;
-  }
-}
-async function executeChat(messages) {
-  const response = await callAPI("/v1/chat", {
-    method: "POST",
-    body: { messages }
-  });
-  return response;
-}
-async function executeCode(prompt) {
-  const response = await callAPI("/v1/ai-proxy", {
-    method: "POST",
-    body: {
-      prompt,
-      taskType: "code"
-    }
-  });
-  if (response.data?.routedModel) {
-    response.routedModel = response.data.routedModel;
-  }
-  if (response.data?.content) {
-    response.output = response.data.content;
-  }
-  return response;
-}
-async function executeAIProxy(provider, model, messages, options) {
-  return callAPI("/v1/ai-proxy", {
-    method: "POST",
-    body: { provider, model, messages, options }
-  });
-}
-var agent, authManager2, RateLimitError2;
-var init_api_caller = __esm({
-  "src/services/cli-auth/api-caller.ts"() {
-    init_AuthenticationManager();
-    agent = new https__default.default.Agent({ keepAlive: true });
-    authManager2 = new AuthenticationManager();
-    RateLimitError2 = class extends Error {
-      constructor(message, retryAfter) {
-        super(message);
-        this.retryAfter = retryAfter;
-        this.name = "RateLimitError";
-      }
-    };
-  }
-});
 async function mapAttachmentsToTargets(attached, opts) {
   const warnings = [];
   const mapped = [];
@@ -55318,7 +55747,68 @@ ${requestPreamble}
 ${request}
 
 ${editContext}`;
-            const response = await executeCode(enriched);
+            const ctxAttachments = Array.isArray(opts.attachedFiles) && opts.attachedFiles.length > 0 ? opts.attachedFiles.map((f3) => ({
+              name: f3.originalName,
+              path: f3.pathHint,
+              mime: f3.mime || "text/plain",
+              data_base64: f3.content ? Buffer.from(f3.content, "utf8").toString("base64") : void 0
+            })).map((a) => a.data_base64 ? a : { ...a, data_base64: void 0 }) : [];
+            const pathAttachments = [];
+            if (explicitFiles.length > 0) {
+              try {
+                const fs51 = await import('fs/promises');
+                const pathMod = await import('path');
+                for (const rel of explicitFiles) {
+                  try {
+                    const full = explicitAbsMap[rel] || pathMod.join(opts.root, rel);
+                    const stat13 = await fs51.stat(full).catch(() => null);
+                    if (!stat13 || !stat13.isFile()) continue;
+                    const buf = await fs51.readFile(full);
+                    const ext2 = (pathMod.extname(full) || "").toLowerCase();
+                    const mime = ext2 === ".pdf" ? "application/pdf" : ext2 === ".png" ? "image/png" : ext2 === ".jpg" || ext2 === ".jpeg" ? "image/jpeg" : ext2 === ".webp" ? "image/webp" : ext2 === ".gif" ? "image/gif" : ext2 === ".bmp" ? "image/bmp" : ext2 === ".svg" ? "image/svg+xml" : ext2 === ".tif" || ext2 === ".tiff" ? "image/tiff" : ext2 === ".heic" ? "image/heic" : ext2 === ".heif" ? "image/heif" : "text/plain";
+                    pathAttachments.push({
+                      name: pathMod.basename(full),
+                      path: full,
+                      mime,
+                      data_base64: buf.toString("base64")
+                    });
+                  } catch {
+                  }
+                }
+              } catch {
+              }
+            }
+            const hydratedCtx = [];
+            if (ctxAttachments.length > 0) {
+              try {
+                const fs51 = await import('fs/promises');
+                for (const a of ctxAttachments) {
+                  if (a.data_base64) {
+                    hydratedCtx.push(a);
+                    continue;
+                  }
+                  const p = a.path || "";
+                  if (!p) {
+                    continue;
+                  }
+                  try {
+                    const stat13 = await fs51.stat(p).catch(() => null);
+                    if (!stat13 || !stat13.isFile()) {
+                      hydratedCtx.push(a);
+                      continue;
+                    }
+                    const buf = await fs51.readFile(p);
+                    hydratedCtx.push({ ...a, data_base64: buf.toString("base64") });
+                  } catch {
+                    hydratedCtx.push(a);
+                  }
+                }
+              } catch {
+                hydratedCtx.push(...ctxAttachments);
+              }
+            }
+            const allAttachments = (hydratedCtx.length ? hydratedCtx : ctxAttachments).concat(pathAttachments);
+            const response = await executeCode(allAttachments.length > 0 ? { prompt: enriched, provider: "google", model: "gemini-2.5-flash", attachments: allAttachments } : enriched);
             const raw = (response.output || response?.data?.content || "").trim();
             if (!raw) {
               return {
@@ -55447,6 +55937,7 @@ ${editContext}`;
   const remainingSkipped = (validated.skipped || []).filter((p) => !skippedPlans.some((sp) => sp.path === p)).map((p) => ({ path: p, kind: "source", action: "skip", description: "" }));
   const displayFiles = validated.files.concat(skippedPlans).concat(remainingSkipped);
   const summary = summarizePlan(displayFiles);
+  const planView = opts.flags.planOnly || opts.flags.dryRun || !opts.flags.apply;
   const lines = [
     formatPlan(summary, {
       mode: outputMode,
@@ -55454,11 +55945,26 @@ ${editContext}`;
       diffBudget: collectDiffBudget(opts.flags),
       root: opts.root,
       requestText: request,
-      validated: { warnings: validated.warnings.slice(), skipped: validated.skipped.slice() }
+      validated: { warnings: validated.warnings.slice(), skipped: validated.skipped.slice() },
+      planView
     })
   ];
   if (opts.flags.planOnly || opts.flags.dryRun || !opts.flags.apply) {
-    return { plan: normalized, validated, summaryLines: withNotices(lines) };
+    let specMarkdown;
+    try {
+      const prompt = buildSpecPrompt(request, normalized);
+      const { callApiJson: callApiJson4 } = await Promise.resolve().then(() => (init_api_client(), api_client_exports));
+      try {
+        const resp = await callApiJson4("/v1/ai-proxy", { method: "POST", body: JSON.stringify({ prompt, taskType: "chat" }), headers: { "Content-Type": "application/json" } });
+        const content = resp?.data?.content || resp?.content;
+        if (content && typeof content === "string") specMarkdown = content;
+      } catch {
+      }
+    } catch {
+    }
+    const res = { plan: normalized, validated, summaryLines: withNotices(lines) };
+    if (specMarkdown && typeof specMarkdown === "string" && specMarkdown.trim()) res.specMarkdown = specMarkdown;
+    return res;
   }
   if (opts.flags.interactive && !opts.flags.yes && !process.stdin.isTTY) {
     lines.push("", "WARN: Non-TTY interactive request downgraded to plan-only. Re-run with --yes to apply non-interactively.");
@@ -55538,6 +56044,36 @@ ${editContext}`;
     return { plan: normalized, validated, summaryLines: withNotices([errorLine(err)]) };
   }
 }
+function buildSpecPrompt(request, plan) {
+  const tree = {};
+  for (const f3 of plan) {
+    const dir = f3.path.split("/").slice(0, -1).join("/") || ".";
+    if (!tree[dir]) tree[dir] = [];
+    tree[dir].push(`${f3.action} ${f3.path} ${f3.language ? "(" + f3.language + ")" : ""}`.trim());
+  }
+  const treeLines = [];
+  for (const [dir, items] of Object.entries(tree)) {
+    treeLines.push(`- ${dir}`);
+    for (const it of items) treeLines.push(`  - ${it}`);
+  }
+  return [
+    "You are a senior staff engineer. Produce a concise, high-quality Markdown spec for the following code change plan.",
+    "",
+    "Sections:",
+    "- Overview",
+    "- File Tree",
+    "- Per-file Rationale (what/why)",
+    "- Next Steps",
+    "",
+    "Request:",
+    "```",
+    request,
+    "```",
+    "",
+    "Planned files:",
+    treeLines.join("\n")
+  ].join("\n");
+}
 function normalizePreviewLines(n) {
   return typeof n === "number" && n > 0 ? n : void 0;
 }
@@ -55559,7 +56095,7 @@ function mapCodeErrorToReason(err) {
   const error2 = err;
   const message = typeof error2?.message === "string" ? error2.message.toLowerCase() : "";
   const code = typeof error2?.code === "string" ? error2.code.toLowerCase() : "";
-  if (error2 instanceof RateLimitError2 || message.includes("rate") && message.includes("limit")) {
+  if (error2 instanceof RateLimitError || message.includes("rate") && message.includes("limit")) {
     return "rate-limit";
   }
   if (message.includes("timeout") || code === "etimedout") {
@@ -55732,7 +56268,7 @@ function scanSoftIssues(files) {
   return { hasTrailingWhitespace: tw, hasConflictMarkers: cm };
 }
 function parseExplicitFilenames(request) {
-  const matches = request.match(/([\w.-]+\.(?:html|css|js|jsx|ts|tsx))/gi);
+  const matches = request.match(/([\w\-./\\:]+\.[A-Za-z0-9]{1,10})/gi);
   if (!matches) return [];
   const seen = /* @__PURE__ */ new Set();
   const out = [];
@@ -56032,9 +56568,11 @@ var LANGUAGE_EXTENSIONS, CodeCommand, codeCommand, metadata3;
 var init_code_command = __esm({
   "src/slash-commands/categories/code/code.command.ts"() {
     init_base_command();
+    init_api_caller();
     init_rate_limit_handler();
     init_animations();
     init_code_utils();
+    init_ArgumentInference();
     LANGUAGE_EXTENSIONS = {
       javascript: ".js",
       typescript: ".ts",
@@ -56053,7 +56591,7 @@ var init_code_command = __esm({
       name = "code";
       category = "implementation";
       description = "Generate code with AI";
-      usage = "<request> [--plan-only|--sow] [--apply] [--dry-run] [--interactive] [--yes] [--max-files N] [--root DIR] [--rollback on|off] [--output names|summary|detail|diff] [--no-code] [--preview-lines N] [--only-attached] [--attach-mode strict|assist] [--max-attachments N] [--diff-lines N] [--diff-bytes N] [--diff-hunks N]";
+      usage = "<request> [--plan-only|--sow] [--apply] [--dry-run] [--interactive] [--yes] [--max-files N] [--root DIR] [--rollback on|off] [--output names|summary|detail|diff] [--no-code] [--preview-lines N] [--only-attached] [--attach-mode strict|assist] [--max-attachments N] [--diff-lines N] [--diff-bytes N] [--diff-hunks N] [--diff-global-max-files N] [--diff-global-max-bytes N]";
       aliases = ["c"];
       examples = [
         {
@@ -56068,12 +56606,50 @@ var init_code_command = __esm({
         }
       ];
       async execute(commandArgs, context2) {
-        const request = commandArgs.raw.join(" ").trim();
+        const request = await this.ensureLanguageDefaults(commandArgs.raw.join(" ").trim());
         if (!request) {
           return this.error("Please provide a code request \xB7 Example: /code create button component\nTip: Use --plan-only to safely review the plan, or --output detail to preview snippet heads.");
         }
         try {
           const opts = this.parseV2Options(commandArgs.raw);
+          try {
+            const rawText = commandArgs.raw.join(" ");
+            const explicitPlan = commandArgs.raw.includes("--plan-only") || commandArgs.raw.includes("--sow");
+            const explicitDry = commandArgs.raw.includes("--dry-run");
+            const explicitOutput = commandArgs.raw.some((x2) => x2.startsWith("--output") || x2 === "--verbose" || x2 === "-v");
+            const explicitPreview = commandArgs.raw.some((x2) => x2.startsWith("--preview-lines"));
+            const preSpin = new ProcessAnimation();
+            preSpin.start();
+            let inferred = {};
+            try {
+              inferred = await inferCodeArgs(rawText);
+            } finally {
+              try {
+                preSpin.stop();
+              } catch {
+              }
+            }
+            if (!explicitPlan && !explicitDry) {
+              if (typeof inferred.planOnly === "boolean") opts.planOnly = inferred.planOnly;
+              if (typeof inferred.dryRun === "boolean") opts.dryRun = inferred.dryRun;
+            }
+            if (!explicitOutput && inferred.output) {
+              opts.output = inferred.output;
+            }
+            if (!explicitPreview && typeof inferred.previewLines === "number") {
+              opts.previewLines = inferred.previewLines;
+            }
+          } catch {
+          }
+          if (opts.planOnly) {
+            opts.apply = false;
+            opts.dryRun = false;
+          }
+          if (opts.dryRun) {
+            opts.apply = false;
+          }
+          if (opts.dryRun && !opts.output) opts.output = "detail";
+          if (opts.dryRun && !opts.previewLines) opts.previewLines = 50;
           const root = opts.root || process.cwd();
           const { orchestrate: orchestrate2 } = await Promise.resolve().then(() => (init_Orchestrator(), Orchestrator_exports));
           const attachments = await this.collectAttachedFiles(context2).catch(() => []);
@@ -56083,8 +56659,57 @@ var init_code_command = __esm({
           const spinner = new ProcessAnimation();
           spinner.start();
           try {
-            const res = await orchestrate2(request, { root, flags: { planOnly: opts.planOnly, apply: opts.apply, dryRun: opts.dryRun, interactive: opts.interactive, yes: opts.yes, maxFiles: opts.maxFiles, output: opts.output, hideCode: opts.noCode, previewLines: this.normalizePreviewLines(opts.previewLines), verbose: opts.verbose, onlyAttached: opts.onlyAttached, attachMode: opts.attachMode, maxAttachments: opts.maxAttachments, diffLines: opts.diffLines, diffBytes: opts.diffBytes, diffHunks: opts.diffHunks, allowDotfiles: opts.allowDotfiles }, abortSignal: abort.signal, attachedFiles: attachments });
-            const out = res.summaryLines.join("\n");
+            const res = await orchestrate2(request, { root, flags: { planOnly: opts.planOnly, apply: opts.apply, dryRun: opts.dryRun, interactive: opts.interactive, yes: opts.yes, maxFiles: opts.maxFiles, output: opts.output, hideCode: opts.noCode, previewLines: this.normalizePreviewLines(opts.previewLines), verbose: opts.verbose, onlyAttached: opts.onlyAttached, attachMode: opts.attachMode, maxAttachments: opts.maxAttachments, diffLines: opts.diffLines, diffBytes: opts.diffBytes, diffHunks: opts.diffHunks, diffGlobalMaxFiles: opts.diffGlobalMaxFiles, diffGlobalMaxBytes: opts.diffGlobalMaxBytes, allowDotfiles: opts.allowDotfiles }, abortSignal: abort.signal, attachedFiles: attachments });
+            if (opts.planOnly) {
+              const fs51 = await import('fs/promises');
+              const path64 = await import('path');
+              const spec = res?.specMarkdown;
+              const lines = Array.isArray(res?.summaryLines) ? res.summaryLines : [];
+              const planItems = [];
+              for (const l of lines) {
+                const s2 = String(l).trim();
+                if (!s2) continue;
+                if (/^Modified Artifacts/i.test(s2)) continue;
+                if (/^OK:/i.test(s2)) continue;
+                if (/^Next steps:/i.test(s2)) continue;
+                const m2 = /^-\s+(create|modify)\s+(.+)$/i.exec(s2);
+                if (m2) {
+                  planItems.push(`- [plan] ${m2[1].toLowerCase()} ${m2[2]}`);
+                  continue;
+                }
+                planItems.push(`- ${s2}`);
+              }
+              const md = [];
+              if (spec && spec.trim()) {
+                md.push(spec.trim());
+              } else {
+                md.push("# Code Plan");
+                md.push("");
+                md.push("## Request");
+                md.push("");
+                md.push("```");
+                md.push(request);
+                md.push("```");
+                md.push("");
+                md.push("## Proposed Changes");
+                md.push("");
+                if (planItems.length) md.push(...planItems);
+                else md.push("- (no summary available)");
+              }
+              const plansDir = path64.join(root, ".maria", "plans");
+              await fs51.mkdir(plansDir, { recursive: true });
+              const ts = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+              const fileName = `code-plan-${ts}.md`;
+              const outPath = path64.join(plansDir, fileName);
+              await fs51.writeFile(outPath, md.join("\n") + "\n", "utf8");
+              const rel = path64.relative(root, outPath);
+              return this.success(`Code plan saved: ${rel}`);
+            }
+            const detail = res?.detailLines;
+            if (opts.dryRun && Array.isArray(detail) && detail.length) {
+              return this.success(detail.join("\n"));
+            }
+            const out = Array.isArray(res?.summaryLines) ? res.summaryLines.join("\n") : "";
             return this.success(out);
           } finally {
             try {
@@ -56134,9 +56759,68 @@ ${pretty}`);
           return this.error(parts.join("\n"));
         }
       }
+      // Add default language hints when not specified by the user (LLM-assisted detection)
+      async ensureLanguageDefaults(raw) {
+        try {
+          const system = [
+            "You analyze a user's code-generation request.",
+            "Decide if the user explicitly specified a programming language or framework/tooling (e.g., TypeScript, Python, Rust, Java, React, Vue, Node, etc.).",
+            'Return ONLY compact JSON with shape {"explicitLanguage": boolean, "language"?: string}.',
+            "Do not add any commentary."
+          ].join("\n");
+          const user = `Request: ${raw}`;
+          const resp = await callAPI("/v1/ai-proxy", {
+            method: "POST",
+            body: {
+              provider: "google",
+              model: "gemini-2.5-flash",
+              taskType: "chat",
+              prompt: `${system}
+
+${user}`
+            }
+          });
+          const content = (resp?.data?.content || resp?.content || "").trim();
+          const extractFirstJson6 = (text) => {
+            const fence = /```\s*json\s*\r?\n([\s\S]*?)```/i.exec(text);
+            if (fence) return fence[1];
+            const generic = /```\s*\r?\n([\s\S]*?)```/i.exec(text);
+            if (generic) {
+              try {
+                JSON.parse(generic[1]);
+                return generic[1];
+              } catch {
+              }
+            }
+            const start = text.indexOf("{");
+            const end = text.lastIndexOf("}");
+            if (start >= 0 && end > start) {
+              const cand = text.slice(start, end + 1);
+              try {
+                JSON.parse(cand);
+                return cand;
+              } catch {
+              }
+            }
+            return null;
+          };
+          const jsonText = extractFirstJson6(content) || content;
+          let parsed = {};
+          try {
+            parsed = JSON.parse(jsonText);
+          } catch {
+            parsed.explicitLanguage = /```\s*[a-zA-Z]/.test(raw) || /\.(ts|tsx|js|jsx|py|java|kt|go|rs|rb|swift|cs|c|cpp|hpp|php|scala|hs|ex|exs|dart|lua|zig|sol|sql)\b/i.test(raw);
+          }
+          if (parsed && parsed.explicitLanguage) return raw;
+        } catch {
+        }
+        const hint = " (Use TypeScript and React; prefer functional components and node)";
+        return raw + hint;
+      }
       // v2.0 helpers
       parseV2Options(raw) {
-        const opts = { planOnly: false, apply: false, dryRun: false, interactive: false, yes: false, rollback: true, output: void 0, noCode: false, previewLines: 0, root: void 0, maxFiles: void 0, verbose: false, gitGuard: void 0, allowDotfiles: false, confirmOverwrites: [], gitCommit: void 0, gitBranch: void 0, gitTag: void 0, gitTagPrefix: void 0, gitPush: void 0, gitPushRemote: void 0, onlyAttached: false, attachMode: "assist", maxAttachments: 50, diffLines: void 0, diffBytes: void 0, diffHunks: void 0 };
+        const opts = { planOnly: false, apply: false, dryRun: false, interactive: false, yes: false, rollback: true, output: void 0, noCode: false, previewLines: 0, root: void 0, maxFiles: void 0, verbose: false, gitGuard: void 0, allowDotfiles: false, confirmOverwrites: [], gitCommit: void 0, gitBranch: void 0, gitTag: void 0, gitTagPrefix: void 0, gitPush: void 0, gitPushRemote: void 0, onlyAttached: false, attachMode: "assist", maxAttachments: 50, diffLines: void 0, diffBytes: void 0, diffHunks: void 0, diffGlobalMaxFiles: void 0, diffGlobalMaxBytes: void 0 };
+        const explicit = { apply: false, planOnly: false, dryRun: false };
         const a = raw.slice();
         while (a.length) {
           const x2 = a.shift();
@@ -56146,12 +56830,15 @@ ${pretty}`);
             case "plan-only":
             case "sow":
               opts.planOnly = true;
+              explicit.planOnly = true;
               break;
             case "apply":
               opts.apply = true;
+              explicit.apply = true;
               break;
             case "dry-run":
               opts.dryRun = true;
+              explicit.dryRun = true;
               break;
             case "interactive":
               opts.interactive = true;
@@ -56211,6 +56898,12 @@ ${pretty}`);
             case "diff-hunks":
               opts.diffHunks = Number(v || a.shift());
               break;
+            case "diff-global-max-files":
+              opts.diffGlobalMaxFiles = Number(v || a.shift());
+              break;
+            case "diff-global-max-bytes":
+              opts.diffGlobalMaxBytes = Number(v || a.shift());
+              break;
             case "confirm-overwrites": {
               const list = (v || a.shift() || "").split(",").map((s2) => s2.trim()).filter(Boolean);
               opts.confirmOverwrites = list;
@@ -56244,8 +56937,16 @@ ${pretty}`);
             }
           }
         }
-        if (!opts.apply && !opts.planOnly && !opts.dryRun) {
-          opts.apply = true;
+        if (explicit.planOnly || explicit.dryRun) {
+          opts.apply = false;
+        }
+        if (explicit.planOnly) {
+          opts.dryRun = false;
+        }
+        if (!explicit.apply && !explicit.planOnly && !explicit.dryRun) {
+          if (!opts.apply && !opts.planOnly && !opts.dryRun) {
+            opts.apply = true;
+          }
         }
         return opts;
       }
@@ -71083,7 +71784,7 @@ ${user}`,
     };
   }
 });
-function extractFirstJson(text) {
+function extractFirstJson5(text) {
   const fence = /```json\r?\n([\s\S]*?)```/i.exec(text);
   if (fence) return fence[1];
   const start = text.indexOf("{");
@@ -71130,7 +71831,7 @@ ${user}`,
     }
   });
   const raw = (response?.data?.content || response?.output || "").trim();
-  const jsonText = extractFirstJson(raw) || raw;
+  const jsonText = extractFirstJson5(raw) || raw;
   let parsed = {};
   try {
     parsed = JSON.parse(jsonText);
@@ -71151,7 +71852,7 @@ ${user}`,
   }
   return out;
 }
-var init_ArgumentInference = __esm({
+var init_ArgumentInference2 = __esm({
   "src/services/evaluation/ArgumentInference.ts"() {
     init_api_caller();
   }
@@ -71172,7 +71873,7 @@ var init_evaluate_command = __esm({
     init_EvaluationOrchestrator();
     init_api_caller();
     init_animations();
-    init_ArgumentInference();
+    init_ArgumentInference2();
     EvaluateCommand = class extends BaseCommand {
       name = "evaluate";
       category = "evaluation";
@@ -71855,7 +72556,7 @@ __export(slash_commands_exports, {
   MemoryStatusCommand: () => MemoryStatusCommand,
   PermissionError: () => PermissionError,
   PlanCommand: () => PlanCommand,
-  RateLimitError: () => RateLimitError,
+  RateLimitError: () => RateLimitError2,
   RateLimitMiddleware: () => RateLimitMiddleware,
   RecallCommand: () => RecallCommand,
   RememberCommand: () => RememberCommand,
@@ -72417,6 +73118,17 @@ var init_slash_commands = __esm({
     init_registry();
   }
 });
+
+// src/cli/session-state.ts
+function clearSession() {
+  while (session.length) session.pop();
+}
+var session;
+var init_session_state = __esm({
+  "src/cli/session-state.ts"() {
+    session = [];
+  }
+});
 async function handleSlash(input3) {
   if (!input3.startsWith("/")) return false;
   const { cmd, args: args2, options, flags } = parseSlash(input3);
@@ -72425,7 +73137,10 @@ async function handleSlash(input3) {
       clearTerminal();
     } catch {
     }
-    return true;
+    try {
+      clearSession();
+    } catch {
+    }
   }
   if (cmd === "doctor") {
     console.log(chalk14__default.default.white("Run as subcommand: maria doctor"));
@@ -72477,6 +73192,7 @@ var init_handle_slash = __esm({
     init_slash_commands();
     init_cli_auth();
     init_terminal();
+    init_session_state();
   }
 });
 function formatAnyError(err) {
@@ -74484,7 +75200,7 @@ var init_ai_response_service = __esm({
        */
       async callLLM(prompt, opts = {}) {
         const {
-          system = PLAIN_OUTPUT ? "Return ONLY the answer (or ONLY code). No menus, no lists, no guided flows. Always respond in English." : "You are a helpful senior engineer named Maria. Always respond in English. Provide direct, production-quality answers. Make sure you answer in plain text, as a natural chat. When asked about the model (not your name or who you are, but the model), say you are a large language model fully trained by Bonginkan.",
+          system = PLAIN_OUTPUT ? "Return ONLY the answer (or ONLY code). No menus, no lists, no guided flows. Always respond in English. If a local file path is provided, make sure you read the uploaded file before taking any actions." : "You are a helpful senior engineer named Maria. Always respond in English. Provide direct, production-quality answers. Make sure you answer in plain text, as a natural chat. When asked about the model (not your name or who you are, but the model), say you are a large language model fully trained by Bonginkan. If a path is provided, return the path as a string. If a local file path is provided, make sure you read the uploaded/attached file (which is likely equivalent to the path) before taking any actions.",
           model = void 0,
           provider = DEFAULT_PROVIDER2,
           temperature = 0.2,
@@ -74492,14 +75208,63 @@ var init_ai_response_service = __esm({
         } = opts;
         process.env.MARIA_API_BASE || "https://api.maria-code.ai";
         const preferApi = String(process.env.MARIA_USE_API || "1") === "1";
+        let effectiveAttachments = Array.isArray(opts.attachments) ? opts.attachments.slice() : [];
         if (preferApi) {
           try {
             const { callAPI: callAPI2 } = await Promise.resolve().then(() => (init_api_caller(), api_caller_exports));
+            let autoAttachments = [];
+            try {
+              const pathPattern = /(?:^|\s)([\w\-\.\/\\:]+\.[A-Za-z0-9]{1,10})(?:\s|$)/gi;
+              const candidates = /* @__PURE__ */ new Set();
+              let m2;
+              const textToScan = `${prompt}`;
+              while ((m2 = pathPattern.exec(textToScan)) !== null) {
+                const p = (m2[1] || "").trim();
+                if (p) candidates.add(p);
+              }
+              if (candidates.size > 0) {
+                const fs51 = await import('fs/promises');
+                const pathMod = await import('path');
+                const cwd2 = process.cwd();
+                for (const cand of candidates) {
+                  try {
+                    const normalized = cand.replace(/^"|"$/g, "").replace(/^'|'$/g, "");
+                    const abs = pathMod.isAbsolute(normalized) ? normalized : pathMod.join(cwd2, normalized);
+                    const st = await fs51.stat(abs).catch(() => null);
+                    if (!st || !st.isFile()) continue;
+                    const buf = await fs51.readFile(abs);
+                    const ext2 = (pathMod.extname(abs) || "").toLowerCase();
+                    const mime = ext2 === ".pdf" ? "application/pdf" : ext2 === ".png" ? "image/png" : ext2 === ".jpg" || ext2 === ".jpeg" ? "image/jpeg" : ext2 === ".webp" ? "image/webp" : ext2 === ".gif" ? "image/gif" : ext2 === ".bmp" ? "image/bmp" : ext2 === ".svg" ? "image/svg+xml" : ext2 === ".tif" || ext2 === ".tiff" ? "image/tiff" : ext2 === ".heic" ? "image/heic" : ext2 === ".heif" ? "image/heif" : "text/plain";
+                    autoAttachments.push({ name: pathMod.basename(abs), path: abs, mime, data_base64: buf.toString("base64") });
+                  } catch {
+                  }
+                }
+              }
+            } catch {
+            }
+            if (autoAttachments.length > 0) {
+              const existing = new Set(effectiveAttachments.map((a) => (a.path || a.name || "").toLowerCase()));
+              for (const a of autoAttachments) {
+                const key = (a.path || a.name || "").toLowerCase();
+                if (!existing.has(key)) {
+                  effectiveAttachments.push(a);
+                  existing.add(key);
+                }
+              }
+            }
+            const inlineSection = "";
             const r2 = await callAPI2("/v1/ai-proxy", {
               method: "POST",
-              body: { prompt: `${system}
+              body: {
+                // When attachments are present, force an attachments-capable route (mirror /evaluate)
+                ...effectiveAttachments.length ? { provider: "google", model: "gemini-2.5-flash" } : {},
+                prompt: `${system}
 
-${prompt}`, taskType: "chat" }
+${prompt}${inlineSection}`,
+                taskType: "chat",
+                // mirror /evaluate: include attachments in metadata
+                ...effectiveAttachments.length ? { metadata: { attachments: effectiveAttachments } } : {}
+              }
             });
             const apiContent = r2?.data?.content || r2?.content;
             if (apiContent) return apiContent;
@@ -74512,10 +75277,42 @@ ${prompt}`, taskType: "chat" }
           } catch {
           }
         }
-        const res = await this.providerManager.complete({
-          prompt: `${system}
+        let fallbackPrompt = `${system}
 
-${prompt}`,
+${prompt}`;
+        try {
+          const attList = effectiveAttachments && effectiveAttachments.length ? effectiveAttachments : [];
+          if (attList.length > 0) {
+            const limitBytes = 128 * 1024;
+            let used = 0;
+            const sections = [];
+            for (const a of attList) {
+              if (!a?.data_base64) continue;
+              try {
+                const buf = Buffer.from(a.data_base64, "base64");
+                const text = /^(application\/pdf)/i.test(String(a.mime || "")) ? "" : buf.toString("utf8");
+                if (!text) continue;
+                const remaining = Math.max(0, limitBytes - used);
+                if (remaining <= 0) break;
+                const slice = text.length > remaining ? text.slice(0, remaining) : text;
+                used += Buffer.byteLength(slice, "utf8");
+                sections.push(`[BEGIN file: ${a.path || a.name || "attachment.txt"}]
+${slice}
+[END]`);
+              } catch {
+              }
+            }
+            if (sections.length > 0) {
+              fallbackPrompt = `${fallbackPrompt}
+
+[ATTACHMENTS]
+${sections.join("\n\n")}`;
+            }
+          }
+        } catch {
+        }
+        const res = await this.providerManager.complete({
+          prompt: fallbackPrompt,
           model,
           temperature,
           maxTokens
@@ -75760,7 +76557,7 @@ async function init2() {
   ai = res.ai;
   res.ctx;
   store = res.store;
-  while (session.length) session.pop();
+  clearSession();
   for (const m2 of res.session) session.push(m2);
   await loadServices2();
 }
@@ -75777,6 +76574,9 @@ async function streamAnswer(text, opts = {}) {
     s2 = s2.replace(/\[BEGIN\s+file:[^\]]+\][\s\S]*?\[END\]/g, "");
     return s2;
   };
+  const removeAttachmentSections = (s2) => {
+    return s2.replace(/\[ATTACHMENTS\][\s\S]*$/i, "");
+  };
   const hasAnyCodeBlocks = (s2) => /```[\s\S]*?```|\[BEGIN\s+file:/i.test(s2);
   const envInt = (name2, def) => {
     const v = Number(process.env[name2]);
@@ -75802,10 +76602,11 @@ async function streamAnswer(text, opts = {}) {
         model: process.env.MARIA_MODEL || "gemini-2.5-flash"
       });
       animation.stop();
-      const containsCode = hasAnyCodeBlocks(resp || "");
-      if (containsCode) {
+      const respForArtifactCheck = removeAttachmentSections(resp || "");
+      const containsCode = hasAnyCodeBlocks(respForArtifactCheck);
+      if (containsCode && opts.triage && opts.triage.type === "route-code") {
         try {
-          const artifacts = extractAllCodeInfos(resp);
+          const artifacts = extractAllCodeInfos(respForArtifactCheck);
           const savedFiles = [];
           let okCount = 0, warnCount = 0, errCount = 0;
           for (const { language, code, extension, filename: suggested } of artifacts) {
@@ -75830,7 +76631,7 @@ async function streamAnswer(text, opts = {}) {
               console.log(chalk14__default.default.white(`ERROR: failed ${filepath} (${language}) - ${msg2}`));
             }
           }
-          const prose = stripMarkdownForPlainChat(removeCodeBlocks(resp)).trim();
+          const prose = stripMarkdownForPlainChat(removeCodeBlocks(removeAttachmentSections(resp))).trim();
           if (prose) {
             console.log(chalk14__default.default.white(""));
             console.log(chalk14__default.default.white("Chat Response:"));
@@ -75909,44 +76710,23 @@ async function handleLine(line, options = {}) {
   }
   const consumed = await handleSlash(input3);
   if (consumed) return;
-  let triageResult = options.triageResult ?? null;
-  if (!options.skipTriage) {
-    triageResult = await triage(input3, {
-      locale: process.env.LANG,
-      recentCommands: []
-    });
-    if (triageResult.next?.route) {
-      const commandParts = [
-        triageResult.next.route,
-        ...triageResult.next.args ?? []
-      ];
-      const routedLine = commandParts.join(" ").trim();
-      console.log(chalk14__default.default.white("Routed:"));
-      console.log(chalk14__default.default.white(routedLine));
-      await handleLine(routedLine, {
-        skipChoiceResolution: true,
-        skipTriage: true
-      });
-      console.log(chalk14__default.default.white(""));
-      console.log(chalk14__default.default.white("Summary:"));
-      if (triageResult.type === "route-code") {
-        console.log(chalk14__default.default.white("OK: routed to /code plan-only"));
-        console.log(chalk14__default.default.white("Next steps:"));
-        console.log(chalk14__default.default.white("- Run /code --apply --yes after reviewing the plan"));
-      } else if (triageResult.type === "route-image") {
-        console.log(chalk14__default.default.white("OK: routed to /image"));
-        console.log(chalk14__default.default.white("Next steps:"));
-        console.log(chalk14__default.default.white("- Review generated images and iterate if needed"));
-      } else if (triageResult.type === "route-video") {
-        console.log(chalk14__default.default.white("OK: routed to /video"));
-        console.log(chalk14__default.default.white("Next steps:"));
-        console.log(chalk14__default.default.white("- Inspect the storyboard or render output"));
-      } else {
-        console.log(chalk14__default.default.white("OK: routed"));
-        console.log(chalk14__default.default.white("Next steps:"));
-        console.log(chalk14__default.default.white("- Follow the routed workflow"));
+  if (!input3.startsWith("/")) {
+    const mapped = await mapInputToTopLevelCommand(input3);
+    if (process.env.MARIA_DEBUG === "1") {
+      console.log(chalk14__default.default.white(`Command: {command: '${mapped.command}', args: '${mapped.args}', confidence: '${mapped.confidence}'}`));
+    }
+    try {
+      const threshold = Number(process.env.MARIA_ROUTE_CONFIDENCE || "0.7");
+      if (mapped && mapped.command) {
+        const conf = typeof mapped.confidence === "number" ? mapped.confidence : 1;
+        if (mapped.command === "chat") {
+        } else if (conf >= threshold) {
+          const routed = [mapped.command, ...mapped.args || [input3]].join(" ").trim();
+          await handleLine(routed, { skipChoiceResolution: true, skipTriage: true });
+          return;
+        }
       }
-      return;
+    } finally {
     }
   }
   const isAuthenticated = await authManager.isAuthenticated();
@@ -75959,73 +76739,7 @@ async function handleLine(line, options = {}) {
   const user = { role: "user", content: input3, timestamp: /* @__PURE__ */ new Date() };
   session.push(user);
   if (store?.addMessage) await store.addMessage(user);
-  if (triageResult?.type === "complex") {
-    await handleComplexChat(input3, triageResult);
-    return;
-  }
-  await streamAnswer(input3, { triage: triageResult });
-}
-async function handleComplexChat(request, triageResult) {
-  const animation = new ProcessAnimation();
-  animation.start();
-  try {
-    const authed = await authManager.isAuthenticated();
-    let content = "";
-    if (authed) {
-      try {
-        const resp = await callApiJson("/api/ai", {
-          method: "POST",
-          body: JSON.stringify({ prompt: request, taskType: "planning" }),
-          headers: { "Content-Type": "application/json" }
-        });
-        content = resp?.data?.response || resp?.data?.content || "";
-      } catch {
-      }
-    }
-    if (!content) {
-      animation.stop();
-      await streamAnswer(request, { triage: triageResult });
-      return;
-    }
-    animation.stop();
-    const cleaned = content && typeof content === "string" ? content : buildComplexPlanSteps(request).join("\n");
-    console.log(chalk14__default.default.white(cleaned));
-    const planMessage = {
-      role: "assistant",
-      content: cleaned,
-      timestamp: /* @__PURE__ */ new Date(),
-      metadata: { tag: "complex-chat", triage: triageResult }
-    };
-    session.push(planMessage);
-    if (store?.addMessage) await store.addMessage(planMessage);
-    console.log(chalk14__default.default.white(""));
-    console.log(chalk14__default.default.white("Summary:"));
-    console.log(chalk14__default.default.white("OK: plan prepared"));
-    console.log(chalk14__default.default.white("Next steps:"));
-    console.log(chalk14__default.default.white("- Ask to apply or adjust the plan"));
-  } finally {
-    try {
-      animation.stop();
-    } catch {
-    }
-  }
-}
-function buildComplexPlanSteps(request) {
-  const scoped = request.trim();
-  const steps = [
-    `Clarify scope, constraints, and success criteria for "${scoped}"`,
-    `Review existing modules in src/ and docs/ for related work`,
-    `Design the solution with safe defaults and feature flags if needed`,
-    `Implement changes and document decisions`,
-    `Validate with pnpm test and peer review artifacts`
-  ];
-  if (/(test|spec|verify|検証)/i.test(scoped)) {
-    steps.push("Extend or add Vitest coverage for new behaviour");
-  }
-  if (/(ui|frontend|component|画面)/i.test(scoped)) {
-    steps.push("Capture CLI or UI snapshots to confirm UX changes");
-  }
-  return steps;
+  await streamAnswer(input3, {});
 }
 async function tryResolveChoice(rawLine) {
   const resolution = choiceMemory.resolve(rawLine);
@@ -76117,17 +76831,17 @@ MARIA v${getVersion()}
   registerDoctorSubcommand(program2);
   return program2;
 }
-var InteractiveCLI, ai, store, session, commandManager, startupDisplayed, program;
+var InteractiveCLI, ai, store, commandManager, startupDisplayed, program;
 var init_cli = __esm({
   "src/cli.ts"() {
     init_env_loader();
     init_version();
     init_animations();
     init_cli_auth();
-    init_api_client();
     init_choice_memory();
-    init_triage_orchestrator();
+    init_LlmTopLevelRouter();
     init_handle_slash();
+    init_session_state();
     init_process_handlers();
     init_doctor();
     init_services_loader();
@@ -76135,7 +76849,6 @@ var init_cli = __esm({
     init_interactive_session2();
     init_server();
     init_code_utils();
-    session = [];
     commandManager = null;
     startupDisplayed = false;
     if (!process.env.GOOGLE_AUTH_DISABLE_GCE_CHECK) {