engine7 7.1.63 → 7.1.65

package/dist/cli.mjs

@@ -19762,6 +19762,8 @@ function parseCcRunArgs(argv) {
       args.agentName = takeValue().trim();
     } else if (a === "--resume") {
       takeValue();
+    } else if (a === "--model") {
+      args.model = takeValue().trim();
     }
   }
   if (!hasPrompt) {
@@ -19805,12 +19807,12 @@ function startStdinHandler() {
 `);
         return;
       }
-      if (msg2.type === "user") {
+      if (msg2.type === "user" || msg2.type === void 0 && msg2.message?.content !== void 0) {
         const content = msg2.message?.content;
         let text = "";
         if (typeof content === "string") text = content;
         else if (Array.isArray(content)) {
-          text = content.filter((b) => b?.type === "text").map((b) => b.text).join("\n");
+          text = content.filter((b) => b?.type === "text" || typeof b?.text === "string").map((b) => b.text).join("\n");
         }
         if (text) {
           userTexts.push(text);
@@ -19864,6 +19866,25 @@ async function runQuery(args) {
   loadSecretsEnv(stateDir, configName);
   const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_loader(), loader_exports));
   const config = loadConfig2(configPath);
+  let effectiveModel = config.model;
+  if (args.model && args.model !== config.model) {
+    const slash = args.model.indexOf("/");
+    const pid = slash > 0 ? args.model.slice(0, slash) : "";
+    const mid = slash > 0 ? args.model.slice(slash + 1) : args.model;
+    const provExists = pid && config.providers?.[pid];
+    const modelExists = provExists?.models?.some((m) => (typeof m === "string" ? m : m?.id) === mid);
+    if (provExists && modelExists) {
+      effectiveModel = args.model;
+      config.provider = {
+        ...config.providers?.[pid],
+        id: pid,
+        models: config.providers?.[pid]?.models
+      };
+      console.log(`[cc-run] --model override: ${args.model} (found in providers)`);
+    } else {
+      console.log(`[cc-run] --model "${args.model}" not in config providers, using default ${config.model}`);
+    }
+  }
   const { buildStablePrompt: buildStablePrompt2, buildDynamicPrompt: buildDynamicPrompt2 } = await Promise.resolve().then(() => (init_prompt(), prompt_exports));
   const systemStable = buildStablePrompt2(config.workspace, config.prompt);
   const systemDynamic = buildDynamicPrompt2({ workspace: config.workspace });
@@ -19872,7 +19893,7 @@ async function runQuery(args) {
   const provider = createProvider2(config.provider);
   const { QueryEngine: QueryEngine2 } = await Promise.resolve().then(() => (init_query(), query_exports));
   const engine = new QueryEngine2(provider, {
-    model: config.model,
+    model: effectiveModel,
     systemPrompt,
     maxTokens: 4096,
     temperature: 0.7,
@@ -19885,7 +19906,7 @@ async function runQuery(args) {
     workspace: config.workspace,
     providerId: config.provider.id,
     providerApi: config.provider.api,
-    model: config.model,
+    model: effectiveModel,
     scopeConfig: config.session,
     restoreRecall: config.topics?.restoreRecall
   });
@@ -19907,8 +19928,8 @@ async function runQuery(args) {
     stateDir: config.stateDir,
     providerId: config.provider.id,
     providerApi: config.provider.api,
-    model: config.model,
-    modelInputs: config.provider.models?.find((m) => m.id === config.model)?.input || ["text"],
+    model: effectiveModel,
+    modelInputs: config.provider.models?.find((m) => m.id === effectiveModel)?.input || ["text"],
     systemPrompt,
     channels: config.channels,
     config,
@@ -20062,17 +20083,6 @@ async function doCcRun(argv) {
     }
   }
   installStdoutGuard();
-  if (args.inputFormat === "stream-json" && !process.stdin.isTTY) {
-    const stdinPromise = startStdinHandler();
-    if (!args.prompt) {
-      const stdinPrompt = await stdinPromise;
-      if (stdinPrompt) args.prompt = stdinPrompt;
-    }
-  }
-  if (!args.prompt) {
-    process.stderr.write("cc-run: \u6CA1\u6536\u5230 prompt\uFF08-p \u6216 stdin user message \u5747\u4E3A\u7A7A\uFF09\n");
-    return 1;
-  }
   const sessionId = args.sessionId || randomUUID9();
   args.sessionId = sessionId;
   let model = "";
@@ -20099,6 +20109,17 @@ async function doCcRun(argv) {
     }
     emitInit(sessionId, model);
   }
+  if (args.inputFormat === "stream-json" && !process.stdin.isTTY) {
+    const stdinPromise = startStdinHandler();
+    if (!args.prompt) {
+      const stdinPrompt = await stdinPromise;
+      if (stdinPrompt) args.prompt = stdinPrompt;
+    }
+  }
+  if (!args.prompt) {
+    process.stderr.write("cc-run: \u6CA1\u6536\u5230 prompt\uFF08-p \u6216 stdin user message \u5747\u4E3A\u7A7A\uFF09\n");
+    return 1;
+  }
   let result;
   try {
     result = await runQuery(args);
@@ -21487,6 +21508,21 @@ function execute(entries2) {
 async function main() {
   const args = process.argv.slice(2);
   const subcommand = args[0];
+  const CC_FLAGS = /* @__PURE__ */ new Set([
+    "-p",
+    "--print",
+    "--output-format",
+    "--input-format",
+    "--permission-mode",
+    "--disallowedTools",
+    "--list-models",
+    "--resume"
+  ]);
+  if (subcommand !== void 0 && CC_FLAGS.has(subcommand)) {
+    const { doCcRun: doCcRun2 } = await Promise.resolve().then(() => (init_cli_ccrun(), cli_ccrun_exports));
+    const code = await doCcRun2(args);
+    process.exit(code);
+  }
   if (!subcommand) {
     printHelp();
     process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engine7",
-  "version": "7.1.63",
+  "version": "7.1.65",
   "type": "module",
   "description": "Engine 7 — 给助手一个家 / A home for your AI assistant",
   "main": "dist/main.mjs",