@downcity/agent 1.1.10 → 1.1.12

package/src/service/builtins/task/runtime/Runner.ts

@@ -8,7 +8,7 @@
  * - 把最终产物写入 run 目录的具体格式委托给 `TaskRunArtifacts.ts`。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type {
   DialogueRoundRecord,
   UserSimulatorDecision,
@@ -36,7 +36,6 @@ import {
   buildUserSimulatorQuery,
   parseUserSimulatorDecision,
   runAgentRound,
-  runScriptTask,
   validateTaskResult,
 } from "./TaskRunnerRound.js";
 import {
@@ -45,6 +44,7 @@ import {
   writeTaskRunInputArtifact,
 } from "./TaskRunArtifacts.js";
 import { dispatchTaskRunCompletionToChat } from "./TaskRunChatDispatch.js";
+import { runScriptTaskBranch } from "./TaskRunnerScript.js";
 
 const DEFAULT_MAX_DIALOGUE_ROUNDS = 3;
 const DEFAULT_SINGLE_ROUND = 1;
@@ -170,68 +170,22 @@ export async function runTaskNow(params: {
   const dialogueRecords: DialogueRoundRecord[] = [];
 
   if (taskKind === "script") {
-    dialogueRounds = 1;
-    executionStatus = "success";
-    await runProgress.update({
-      status: "running",
-      phase: "script_running",
-      message: "正在执行 script 任务",
-      round: 1,
-      maxRounds: 1,
+    const scriptResult = await runScriptTaskBranch({
+      context,
+      runDirAbs,
+      sessionId: task.frontmatter.sessionId,
+      scriptBody: task.body,
+      runProgress,
     });
-    try {
-      const scriptResult = await runScriptTask({
-        context,
-        runDirAbs,
-        sessionId: task.frontmatter.sessionId,
-        scriptBody: task.body,
-      });
-      outputText = scriptResult.outputText;
-      await runProgress.update({
-        status: "running",
-        phase: "validating",
-        message: "script 执行完成，正在校验输出与产物",
-        round: 1,
-        maxRounds: 1,
-      });
-      const validation = await validateTaskResult({ outputText });
-      if (validation.errors.length === 0) {
-        ok = true;
-        status = "success";
-        resultStatus = "valid";
-        resultErrors = [];
-        userSimulatorSatisfied = true;
-      } else {
-        ok = false;
-        status = "failure";
-        resultStatus = "invalid";
-        resultErrors = [...validation.errors];
-        errorText = [
-          "Script task result validation failed.",
-          ...resultErrors.map((item) => `- ${item}`),
-        ].join("\n");
-        await runProgress.update({
-          status: "running",
-          phase: "validating",
-          message: "输出校验未通过，准备写入失败产物",
-          round: 1,
-          maxRounds: 1,
-        });
-      }
-    } catch (error) {
-      executionStatus = "failure";
-      status = "failure";
-      resultStatus = "not_checked";
-      resultErrors = [];
-      errorText = `Script task execution failed: ${String(error)}`;
-      await runProgress.update({
-        status: "running",
-        phase: "script_running",
-        message: `script 执行失败: ${summarizeText(String(error), 160)}`,
-        round: 1,
-        maxRounds: 1,
-      });
-    }
+    ok = scriptResult.ok;
+    status = scriptResult.status;
+    executionStatus = scriptResult.executionStatus;
+    resultStatus = scriptResult.resultStatus;
+    resultErrors = scriptResult.resultErrors;
+    dialogueRounds = scriptResult.dialogueRounds;
+    userSimulatorSatisfied = scriptResult.userSimulatorSatisfied;
+    outputText = scriptResult.outputText;
+    errorText = scriptResult.errorText;
   } else {
     let lastRoundRuleErrors: string[] = [];
     let lastRoundDecision: UserSimulatorDecision | null = null;

package/src/service/builtins/task/runtime/TaskActionExecution.ts

@@ -6,7 +6,7 @@
  * - task 定义变更后的 scheduler reload 通过回调注入，避免执行层依赖具体 service 实现。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type {
   TaskCronRegisterResult,
   TaskListActionPayload,

package/src/service/builtins/task/runtime/TaskActionInput.ts

@@ -7,7 +7,7 @@
  */
 
 import { resolveSessionId } from "@session/ids/resolveSessionId.js";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import type { ServiceActionCommandInput } from "@/service/types/Service.js";
 import type { ShipTaskKind, ShipTaskStatus } from "@/service/builtins/task/types/Task.js";
 import type {

package/src/service/builtins/task/runtime/TaskRunChatDispatch.ts

@@ -7,7 +7,7 @@
  * - 回发失败只记录日志，不影响 task run 自身状态。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { ShipTaskDefinitionV1 } from "@/service/builtins/task/types/Task.js";
 
 function resolveTaskFinalText(params: {

package/src/service/builtins/task/runtime/TaskRunnerRound.ts

@@ -8,11 +8,11 @@
 
 import path from "node:path";
 import fs from "fs-extra";
-import { stripInvocationAuthEnv } from "@/host/http/auth/AuthEnv.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import { stripInvocationAuthEnv } from "@/server/http/auth/AuthEnv.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import { runSandboxCommand } from "@/sandbox/SandboxRunner.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 import type {
   ChatSendOutputPick,
   ScriptExecutionResult,

package/src/service/builtins/task/runtime/TaskRunnerScript.ts

@@ -0,0 +1,175 @@
+/**
+ * TaskRunnerScript：script 类型任务执行分支。
+ *
+ * 关键点（中文）
+ * - script 任务是 one-shot 执行，不进入 agent 多轮评审。
+ * - 这里集中处理 script 执行、结果校验与进度更新，Runner 主链只消费归一化结果。
+ */
+
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type {
+  ShipTaskRunExecutionStatusV1,
+  ShipTaskRunResultStatusV1,
+  ShipTaskRunStatusV1,
+} from "@/service/builtins/task/types/Task.js";
+import type { createRunProgressWriter } from "./TaskRunnerProgress.js";
+import { summarizeText } from "./TaskRunnerProgress.js";
+import { runScriptTask, validateTaskResult } from "./TaskRunnerRound.js";
+
+/**
+ * script 任务分支执行参数。
+ */
+export interface RunScriptTaskBranchParams {
+  /**
+   * 当前 Agent 执行上下文。
+   */
+  context: AgentContext;
+  /**
+   * 当前 run 目录绝对路径。
+   */
+  runDirAbs: string;
+  /**
+   * script 任务绑定的 sessionId。
+   */
+  sessionId: string;
+  /**
+   * script 正文。
+   */
+  scriptBody: string;
+  /**
+   * run-progress.json 写入器。
+   */
+  runProgress: ReturnType<typeof createRunProgressWriter>;
+}
+
+/**
+ * script 任务分支执行结果。
+ */
+export interface RunScriptTaskBranchResult {
+  /**
+   * 当前任务是否整体成功。
+   */
+  ok: boolean;
+  /**
+   * run 最终状态。
+   */
+  status: ShipTaskRunStatusV1;
+  /**
+   * 执行器状态。
+   */
+  executionStatus: ShipTaskRunExecutionStatusV1;
+  /**
+   * 结果校验状态。
+   */
+  resultStatus: ShipTaskRunResultStatusV1;
+  /**
+   * 结果校验错误列表。
+   */
+  resultErrors: string[];
+  /**
+   * script 固定占用一轮 dialogue 计数。
+   */
+  dialogueRounds: number;
+  /**
+   * script 任务成功时视为用户模拟器已满意。
+   */
+  userSimulatorSatisfied: boolean;
+  /**
+   * script 标准输出文本。
+   */
+  outputText: string;
+  /**
+   * 失败时的错误文本。
+   */
+  errorText: string;
+}
+
+/**
+ * 执行 script 任务分支。
+ */
+export async function runScriptTaskBranch(
+  params: RunScriptTaskBranchParams,
+): Promise<RunScriptTaskBranchResult> {
+  let ok = false;
+  let status: ShipTaskRunStatusV1 = "failure";
+  let executionStatus: ShipTaskRunExecutionStatusV1 = "success";
+  let resultStatus: ShipTaskRunResultStatusV1 = "not_checked";
+  let resultErrors: string[] = [];
+  let userSimulatorSatisfied = false;
+  let outputText = "";
+  let errorText = "";
+
+  await params.runProgress.update({
+    status: "running",
+    phase: "script_running",
+    message: "正在执行 script 任务",
+    round: 1,
+    maxRounds: 1,
+  });
+
+  try {
+    const scriptResult = await runScriptTask({
+      context: params.context,
+      runDirAbs: params.runDirAbs,
+      sessionId: params.sessionId,
+      scriptBody: params.scriptBody,
+    });
+    outputText = scriptResult.outputText;
+    await params.runProgress.update({
+      status: "running",
+      phase: "validating",
+      message: "script 执行完成，正在校验输出与产物",
+      round: 1,
+      maxRounds: 1,
+    });
+    const validation = await validateTaskResult({ outputText });
+    if (validation.errors.length === 0) {
+      ok = true;
+      status = "success";
+      resultStatus = "valid";
+      resultErrors = [];
+      userSimulatorSatisfied = true;
+    } else {
+      ok = false;
+      status = "failure";
+      resultStatus = "invalid";
+      resultErrors = [...validation.errors];
+      errorText = [
+        "Script task result validation failed.",
+        ...resultErrors.map((item) => `- ${item}`),
+      ].join("\n");
+      await params.runProgress.update({
+        status: "running",
+        phase: "validating",
+        message: "输出校验未通过，准备写入失败产物",
+        round: 1,
+        maxRounds: 1,
+      });
+    }
+  } catch (error) {
+    executionStatus = "failure";
+    status = "failure";
+    resultStatus = "not_checked";
+    resultErrors = [];
+    errorText = `Script task execution failed: ${String(error)}`;
+    await params.runProgress.update({
+      status: "running",
+      phase: "script_running",
+      message: `script 执行失败: ${summarizeText(String(error), 160)}`,
+      round: 1,
+      maxRounds: 1,
+    });
+  }
+
+  return {
+    ok,
+    status,
+    executionStatus,
+    resultStatus,
+    resultErrors,
+    dialogueRounds: 1,
+    userSimulatorSatisfied,
+    outputText,
+    errorText,
+  };
+}

package/src/service/builtins/task/runtime/TaskRunnerSession.ts

@@ -9,7 +9,7 @@
  */
 
 import path from "node:path";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";
 import type { TaskSessionRuntimePort } from "@/service/builtins/task/runtime/TaskRunnerTypes.js";
 import { LocalSessionCore } from "@session/executors/local/LocalSessionCore.js";

package/src/service/core/Manager.ts

@@ -2,9 +2,9 @@
  * Service Manager 门面模块。
  *
  * 关键点（中文）
- * - `main/service/*` 是 service 的管理层，不是具体 service 实现层。
- * - 对外继续保持 `main/service/Manager.ts` 这个稳定入口，统一暴露常用管理能力。
- * - 具体实现位于 `src/services/*`，这里负责注册、生命周期控制、命令转发与远程接口装配。
+ * - `service/core/*` 是 service 的管理层，不是具体 service 实现层。
+ * - 对外继续保持 `service/core/Manager.ts` 这个稳定门面，统一暴露常用管理能力。
+ * - 具体实现位于 `service/builtins/*`，这里负责注册、生命周期控制、命令转发与远程接口装配。
  */
 
 export type {

package/src/service/core/ServiceActionApi.ts

@@ -8,8 +8,8 @@
  */
 
 import type { Context as HonoContext, Hono } from "hono";
-import type { JsonObject, JsonValue } from "@/utils/types/Json.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { JsonObject, JsonValue } from "@/types/common/Json.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { ServiceCommandScheduleInput } from "@/service/types/ServiceSchedule.js";
 import type { BaseService } from "@/service/builtins/BaseService.js";
 import { parseScheduledRunAtMsOrThrow } from "../schedule/Time.js";

package/src/service/core/ServiceActionRunner.ts

@@ -7,8 +7,8 @@
  * - HTTP route 层不会直接实现业务分发，只调用这里的统一入口。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { JsonValue } from "@/types/common/Json.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { ServiceCommandScheduleInput } from "@/service/types/ServiceSchedule.js";
 import type {
   ServiceStateControlAction,

package/src/service/core/ServiceClassRegistry.ts

@@ -7,7 +7,7 @@
  * - CLI / 只读场景也复用这里构造无宿主实例，避免维护第二套静态 definition。
  */
 
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
 import { SERVICE_CLASSES } from "@/service/core/Services.js";
 import { BaseService } from "@/service/builtins/BaseService.js";
 import type { Service } from "@/service/types/Service.js";

package/src/service/core/ServiceManager.ts

@@ -2,8 +2,8 @@
  * ServiceManager 类型门面。
  *
  * 关键点（中文）
- * - service 共享契约已经提升到 `src/types/Service.ts`。
- * - 这里保留旧入口，仅做 re-export，避免 main/service 内部路径继续持有类型定义。
+ * - service 共享契约位于 `service/types/Service.ts`。
+ * - 这里保留旧入口，仅做 re-export，避免 service/core 内部路径继续持有类型定义。
  */
 
 export type {

package/src/service/core/ServiceStateController.ts

@@ -7,14 +7,14 @@
  * - Manager.ts 只作为门面导出，真正逻辑在这里分层实现。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type {
   ServiceStateControlAction,
   ServiceStateControlResult,
   ServiceStateRecord,
   ServiceStateSnapshot,
 } from "@/service/types/ServiceState.js";
-import { getAgentRuntime } from "@/agent/AgentRuntimeState.js";
+import { getAgentRuntime } from "@/runtime/AgentRuntimeState.js";
 import {
   getRegisteredStaticServiceInstances,
   listRegisteredServices,

package/src/service/core/ServiceSystemProviders.ts

@@ -7,7 +7,7 @@
  * - 这样也能避开 `task -> runner -> prompt system -> service class registry` 的循环依赖。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import { buildChatServiceSystem } from "@/service/builtins/chat/runtime/ChatServiceSystem.js";
 import { buildContactServiceSystemText } from "@/service/builtins/contact/runtime/SystemProvider.js";
 import { buildMemoryServiceSystemText } from "@/service/builtins/memory/runtime/SystemProvider.js";

package/src/service/core/Services.ts

@@ -6,7 +6,7 @@
  * - 这里只声明“有哪些 service class”，不承载运行态逻辑。
  */
 
-import type { AgentRuntime } from "@/agent/AgentRuntimeTypes.js";
+import type { AgentRuntime } from "@/runtime/AgentRuntimeTypes.js";
 import type { BaseService } from "@/service/builtins/BaseService.js";
 import { ChatService } from "@/service/builtins/chat/ChatService.js";
 import { TaskService } from "@/service/builtins/task/TaskService.js";

package/src/service/schedule/Executor.ts

@@ -6,7 +6,7 @@
  * - 不负责调度入口和轮询生命周期管理。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import type { ServiceScheduleStore } from "./Store.js";
 import { runServiceCommand } from "@/service/core/Manager.js";
 

package/src/service/schedule/Runtime.ts

@@ -6,7 +6,7 @@
  * - runtime 重启时会把遗留 `running` 任务回退成 `pending`，然后继续补执行。
  */
 
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import { ServiceScheduleStore } from "./Store.js";
 import { runDueScheduledJobs } from "./Executor.js";
 

package/src/service/schedule/Store.ts

@@ -14,7 +14,7 @@ import type {
   ScheduledJobRecord,
   ScheduledJobStatus,
 } from "@/service/types/ServiceSchedule.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 import { generateId } from "@/utils/Id.js";
 import { getDowncityScheduleDbPath } from "@/config/Paths.js";
 

package/src/service/types/Service.ts

@@ -9,8 +9,8 @@
 
 import type { Command } from "commander";
 import type { Context as HonoContext } from "hono";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 /**
  * 服务运行状态。

package/src/service/types/ServiceSchedule.ts

@@ -6,7 +6,7 @@
  * - 该模块只承载调度层状态，不耦合具体 service 的业务语义。
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 /**
  * 调度任务状态。

package/src/service/types/ServiceState.ts

@@ -3,7 +3,7 @@
  *
  * 关键点（中文）
  * - 这里只放状态快照与控制结果，不放 service 契约本身。
- * - 目的是让 main/service 内部拆分后，仍能共享统一的状态结构。
+ * - 目的是让 service/core 内部拆分后，仍能共享统一的状态结构。
  */
 
 import type { ServiceState } from "@/service/types/Service.js";

package/src/service/types/Services.ts

@@ -6,7 +6,7 @@
  * - 支持 lifecycle 控制与通用 command 转发
  */
 
-import type { JsonValue } from "@/utils/types/Json.js";
+import type { JsonValue } from "@/types/common/Json.js";
 
 export type ServiceControlAction = "start" | "stop" | "restart" | "status";
 

package/src/session/Session.ts

@@ -12,7 +12,7 @@ import type { SessionHistoryComposer } from "@session/composer/history/SessionHi
 import { withSessionRunScope } from "@session/SessionRunScope.js";
 import type { SessionRunScope } from "@session/SessionRunScope.js";
 import { buildSessionStepEventMessages } from "@session/messages/SessionStepEventMapper.js";
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 import type { SessionMessageV1 } from "@/session/types/SessionMessages.js";
 import type { SessionExecutor } from "@/session/types/SessionExecutor.js";
 import type { SessionRunResult } from "@/session/types/SessionRun.js";

package/src/session/composer/history/SessionHistoryWriter.ts

@@ -7,7 +7,7 @@
  * - 会话更新后的通知也收在这里，避免把写入细节散到 Session 主类里。
  */
 
-import type { JsonObject } from "@/utils/types/Json.js";
+import type { JsonObject } from "@/types/common/Json.js";
 import type {
   SessionMessageV1,
   SessionMetadataV1,

package/src/session/composer/system/default/DefaultSessionSystemComposer.ts

@@ -10,7 +10,7 @@ import {
   SessionSystemComposer,
 } from "@session/composer/system/SessionSystemComposer.js";
 import { getSessionRunScope } from "@session/SessionRunScope.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import {
   resolveSessionSystemMessages,
   type SystemProfile,

package/src/session/composer/system/default/SystemDomain.ts

@@ -11,7 +11,7 @@ import { transformPromptsIntoSystemMessages } from "@session/composer/system/def
 import { isPluginEnabled } from "@/plugin/core/Activation.js";
 import { PLUGINS } from "@/plugin/core/Plugins.js";
 import { SERVICE_SYSTEM_PROVIDERS } from "@/service/core/ServiceSystemProviders.js";
-import type { AgentContext } from "@/agent/AgentContextTypes.js";
+import type { AgentContext } from "@/runtime/AgentContextTypes.js";
 import { buildRuntimeClockSystemPrompt } from "@session/composer/system/default/variables/VariableReplacer.js";
 import {
   CORE_SYSTEM_PROMPT,