@springbrand/agent-runtime 0.3.0-alpha.7 → 0.3.0-alpha.9

package/src/tools/{subagent.ts → subagent/index.ts}

@@ -5,14 +5,11 @@ import type {
   RuntimeSubagentPort,
   RuntimeSubagentRunResult,
   RuntimeSubagentUsageEvent,
-} from "../config/ports";
-import { AGENT_TYPES } from "./subagent-types/registry";
-import { serializeOutput } from "../lib/artifacts";
-import {
-  isZeroSubagentUsage,
-  subagentTerminalStatus,
-} from "./subagent-runtime";
-import type { PiToolCandidate } from "./compiler";
+} from "../../config/ports";
+import { serializeOutput } from "../../lib/artifacts";
+import type { PiToolCandidate } from "../runtime/contracts";
+import { isZeroSubagentUsage, subagentTerminalStatus } from "./runtime";
+import { AGENT_TYPES } from "./types/registry";
 
 const BACKGROUND_MAX_BUDGET_MS = 10 * 60 * 1_000;
 
@@ -105,7 +102,7 @@ async function recordSubagentResult(
  * 会等待子任务结果，“后台派发”只返回 runId，并由 Host 通过通知把最终结果送回
  * 当前会话。注册表同时生成工具 Schema 和再次校验后台 input，不能改成两份定义。
  *
- * `Host`、`Pi`、`Port`、`Runtime Snapshot` 与“候选工具”见 `../../index.ts`。
+ * `Host`、`Pi`、`Port`、`Runtime Snapshot` 与“候选工具”见 `src/index.ts`。
  */
 export function subagentPiToolCandidates(
   subagents: RuntimeSubagentPort | undefined,
@@ -143,25 +140,25 @@ export function subagentPiToolCandidates(
         }
         const reserved = lifecycle
           ? await subagents.reserve!(type.name, childInput, {
-              parentRunId: lifecycle.parentRunId,
-              submissionId: lifecycle.submissionId,
-              toolCallId: _toolCallId,
-            })
+            parentRunId: lifecycle.parentRunId,
+            submissionId: lifecycle.submissionId,
+            toolCallId: _toolCallId,
+          })
           : undefined;
         if (reserved && lifecycle) await lifecycle.onRegistered(reserved.runId);
         const runOptions = lifecycle
           ? {
-              parentRunId: lifecycle.parentRunId,
-              submissionId: lifecycle.submissionId,
-              ...(reserved ? { subagentRunId: reserved.runId } : {}),
-            }
+            parentRunId: lifecycle.parentRunId,
+            submissionId: lifecycle.submissionId,
+            ...(reserved ? { subagentRunId: reserved.runId } : {}),
+          }
           : undefined;
         const run = lifecycle && reserved
           ? await runRegisteredSubagent(
-              lifecycle,
-              reserved.runId,
-              () => subagents.run(type.name, childInput, runOptions),
-            )
+            lifecycle,
+            reserved.runId,
+            () => subagents.run(type.name, childInput, runOptions),
+          )
           : await subagents.run(type.name, childInput);
         if (lifecycle && !run.childStillRunning) {
           await recordSubagentResult(lifecycle, run);
@@ -213,14 +210,14 @@ export function subagentPiToolCandidates(
       }
       const reserved = lifecycle
         ? await subagents.reserve!(
-            input.agentType,
-            parsed.data as Record<string, unknown>,
-            {
-              parentRunId: lifecycle.parentRunId,
-              submissionId: lifecycle.submissionId,
-              toolCallId,
-            },
-          )
+          input.agentType,
+          parsed.data as Record<string, unknown>,
+          {
+            parentRunId: lifecycle.parentRunId,
+            submissionId: lifecycle.submissionId,
+            toolCallId,
+          },
+        )
         : undefined;
       if (reserved && lifecycle) await lifecycle.onRegistered(reserved.runId);
       const runInput = parsed.data as Record<string, unknown>;
@@ -230,18 +227,18 @@ export function subagentPiToolCandidates(
         notifySource: "dispatch-background",
         ...(lifecycle
           ? {
-              parentRunId: lifecycle.parentRunId,
-              submissionId: lifecycle.submissionId,
-              ...(reserved ? { subagentRunId: reserved.runId } : {}),
-            }
+            parentRunId: lifecycle.parentRunId,
+            submissionId: lifecycle.submissionId,
+            ...(reserved ? { subagentRunId: reserved.runId } : {}),
+          }
           : {}),
       };
       const run = lifecycle && reserved
         ? await runRegisteredSubagent(
-            lifecycle,
-            reserved.runId,
-            () => subagents.run(input.agentType, runInput, runOptions),
-          )
+          lifecycle,
+          reserved.runId,
+          () => subagents.run(input.agentType, runInput, runOptions),
+        )
         : await subagents.run(input.agentType, runInput, runOptions);
       if (lifecycle && !run.childStillRunning && run.status !== "running") {
         await recordSubagentResult(lifecycle, run);

package/src/tools/{subagent-run-repository.ts → subagent/repository.ts}

@@ -5,7 +5,7 @@ export class AgentToolRepository {
   // 保存当前 Agent SQLite 的查询入口。
   // RuntimeDatabase 构造时调用，活动投影随后通过这个 Repository 读取子运行。
   // 把存储绑定留在构造阶段，避免每次读取都传入可能属于其他 Agent 的 sql。
-  constructor(private readonly sql: SqlTaggedTemplate) {}
+  constructor(private readonly sql: SqlTaggedTemplate) { }
 
   // 是否仍有 Agent Tool 子运行在执行。
   // 活动投影在重算 activity 时调用，判定只在这里做一次。

package/src/tools/{subagent-runtime.ts → subagent/runtime.ts}

@@ -1,4 +1,4 @@
-import type { RuntimeSubagentUsageMetrics } from "./subagent-authority";
+import type { RuntimeSubagentUsageMetrics } from "./authority";
 
 export interface RuntimeSubagentRunMetadata {
   readonly submissionId: string;

package/src/tools/{temporary-agent → subagent/temporary}/approvals.ts

@@ -1,9 +1,6 @@
-import type { ApprovalDecision, ApprovalReceipt } from "../../submission/contracts";
-import type { RuntimeTelemetryCoordinator } from "../../telemetry/coordinator";
-import type {
-  TemporaryAgentApprovalDecision,
-  TemporaryAgentApprovalRequest,
-} from "./core";
+import type { ApprovalDecision, ApprovalReceipt } from "../../../submission/contracts";
+import type { RuntimeTelemetryCoordinator } from "../../../telemetry/coordinator";
+import type { TemporaryAgentApprovalDecision, TemporaryAgentApprovalRequest } from "./core";
 
 interface PendingApproval {
   receipt: ApprovalReceipt;
@@ -19,7 +16,7 @@ export class TemporaryAgentApprovals {
   constructor(private readonly options: {
     capture: RuntimeTelemetryCoordinator["capture"];
     onChanged(): Promise<void>;
-  }) {}
+  }) { }
 
   find(executionId: string): ApprovalReceipt | null {
     return this.pending.get(executionId)?.receipt ?? null;

package/src/tools/{temporary-agent → subagent/temporary}/core.ts

@@ -1,4 +1,4 @@
-import type { ExecutionLevel } from "../../lib/execution-level";
+import type { ExecutionLevel } from "../../../lib/execution-level";
 
 export const TEMPORARY_AGENT_LAUNCH_KEY =
   "universal-agent:temporary-agent-launch";

package/src/tools/{temporary-agent → subagent/temporary}/runner.ts

@@ -1,4 +1,4 @@
-import type { RuntimeExtensionConfig } from "../../context/extension/contracts";
+import type { RuntimeExtensionConfig } from "../../../context/extension/contracts";
 
 const BLOCKED_TOOLS = new Set([
   "dispatch_background",

package/src/tools/{temporary-agent → subagent/temporary}/workspace.ts

@@ -1,7 +1,4 @@
-import type {
-  WorkspaceFileInfo,
-  WorkspacePort,
-} from "../../config/ports";
+import type { WorkspaceFileInfo, WorkspacePort } from "../../../config/ports";
 
 const MEMORY_ROOT = "/userspace/memories";
 

package/src/tools/{web-fetch.ts → web/fetch.ts}

@@ -10,14 +10,13 @@
  *   - 不依赖 Workers AI `toMarkdown()`——base runtime 不持有 AI binding，调用方若需要
  *     Markdown 转换，应在宿主层叠加；此处返回原始 UTF-8 解码内容。
  *
- * 本文件未接入任何系统入口（index.ts / base.ts），可单独 import 使用。
+ * 本文件未注册到默认 Tool Surface，可单独 import 使用。
  */
 
 import type { AgentTool } from "@earendil-works/pi-agent-core";
 import { Type } from "@earendil-works/pi-ai";
-import type { PiToolCandidate } from "./compiler";
+import type { PiToolCandidate } from "../runtime/contracts";
 
-// #region 常量
 
 /** 服务端强制截断上限（字节）。调用方 maxBytes 在此之上再被夹断。 */
 const HARD_MAX_BYTES = 5 * 1024 * 1024; // 5 MiB
@@ -28,9 +27,7 @@ const FETCH_TIMEOUT_MS = 30_000;
 /** 发出请求时使用的 User-Agent 字符串。 */
 const USER_AGENT = "UniversalAgent/1.0";
 
-// #endregion
 
-// #region 公开类型
 
 export const webFetchParameters = Type.Object({
   url: Type.String({
@@ -62,9 +59,7 @@ export interface WebFetchDetails {
   bodyLength: number;
 }
 
-// #endregion
 
-// #region 内部工具函数
 
 /**
  * 校验 URL 字符串是否符合 webFetch 的安全约束。
@@ -83,7 +78,7 @@ export function validateWebFetchUrl(input: string): URL {
   if (parsed.protocol !== "https:") {
     throw new Error(
       `Only https:// URLs are allowed; got ${parsed.protocol}//. ` +
-        `Use the HTTPS version of this URL.`,
+      `Use the HTTPS version of this URL.`,
     );
   }
   if (parsed.username || parsed.password) {
@@ -170,9 +165,7 @@ export function formatWebFetchResult(
   ].join("\n");
 }
 
-// #endregion
 
-// #region Pi 工具候选项工厂
 
 /**
  * 创建独立的 `web_fetch` Pi 工具候选项。
@@ -247,7 +240,7 @@ export function webFetchPiToolCandidate(): PiToolCandidate {
         try { await response.body?.cancel(); } catch { /* ignore */ }
         throw new Error(
           `The site at ${finalUrl} sets Content-Signal: ai-input=no, ` +
-            `indicating that it does not permit its content to be used as AI input.`,
+          `indicating that it does not permit its content to be used as AI input.`,
         );
       }
 
@@ -277,5 +270,3 @@ export function webFetchPiToolCandidate(): PiToolCandidate {
     tool,
   };
 }
-
-// #endregion

package/src/tools/web/index.ts

@@ -0,0 +1,2 @@
+export * from "./fetch";
+export * from "./search";