@alpsckr/unitycli 0.4.3 → 0.4.4

package/dist/tools/commands.js

@@ -1,7 +1,10 @@
 import { getString } from "../args.js";
 import { failure } from "../output.js";
-import { dispatchTool } from "./dispatcher.js";
-/** 解析 tools 子命令形态后统一交给 dispatcher，避免发现命令形成第二套路由。 */
+import { resolveCatalogIndependentOperabilityTool } from "./catalog.js";
+import { projectCatalogDescribe, projectCatalogGroups, projectCatalogPage } from "./catalog-control.js";
+import { groupSummary } from "./tools/group-summaries.js";
+import { dispatchCatalogProjection, dispatchTool } from "./dispatcher.js";
+/** tools discovery 属于直接控制面；只有 tools run 进入公开 Tool dispatcher。 */
 export async function handleToolsCommand(command, positional, flags, runtime, requestId) {
     const flagError = rejectUnknownToolFlags(command, positional, flags, requestId);
     if (flagError)
@@ -12,24 +15,49 @@ export async function handleToolsCommand(command, positional, flags, runtime, re
     }
     if (command === "group") {
         if (positional[0] === "list") {
-            return dispatchTool("tools.group-list", positional[1], flags, runtime, requestId, { group: positional[1], ...pageSeed(flags) });
+            const group = positional[1];
+            if (!group)
+                return failure(requestId, "TOOLS_GROUP_LIST_NAME_REQUIRED", "Pass a group name: unitycli tools group list <group>.", ["Run unitycli tools group to see all tool groups."]);
+            const page = pageSeed(flags);
+            return dispatchCatalogProjection("catalog.group-list", { group, ...page }, flags, runtime, requestId, (rootRuntime) => projectCatalogPage(`catalog.group-list:${group}`, page, flags, rootRuntime, requestId, {
+                group,
+                includeExtensionAvailability: true,
+                extraData: { summary: groupSummary(group) },
+                projectItem: (tool) => ({ name: tool.name, summary: tool.summary, ...(tool.available === false ? { available: false } : {}) }),
+            }, catalogDeadline(rootRuntime)));
         }
-        return dispatchTool("tools.group", undefined, flags, runtime, requestId);
+        return dispatchCatalogProjection("catalog.groups", {}, flags, runtime, requestId, (rootRuntime) => projectCatalogGroups(flags, rootRuntime, requestId, catalogDeadline(rootRuntime)));
     }
     if (command === "search") {
         const keyword = positional[0] ?? getString(flags, "keyword") ?? getString(flags, "query");
-        return dispatchTool("tools.search", undefined, flags, runtime, requestId, { keyword, ...pageSeed(flags) });
+        const tokens = (keyword ?? "").split("|").map((token) => token.trim()).filter(Boolean);
+        if (tokens.length === 0)
+            return failure(requestId, "TOOLS_SEARCH_KEYWORD_REQUIRED", "Pass one or more `|`-separated keywords: unitycli tools search <k1|k2|...>.", ["Run unitycli tools group to see tool groups."]);
+        if (tokens.length > 16 || tokens.some((token) => token.length > 128))
+            return failure(requestId, "E_SCHEMA_INVALID", "tools search accepts at most 16 keywords of at most 128 characters each.", [
+                "Reduce the number or length of search keywords before retrying."
+            ], { path: "$.keyword", expected: "1..16 keywords, each 1..128 characters", actual: keyword });
+        const normalizedKeyword = tokens.join("|");
+        const page = pageSeed(flags);
+        return dispatchCatalogProjection("catalog.search", { keyword: normalizedKeyword, ...page }, flags, runtime, requestId, (rootRuntime) => projectCatalogPage(`catalog.search:${normalizedKeyword.toLowerCase()}`, page, flags, rootRuntime, requestId, {
+            keyword: normalizedKeyword,
+            projectItem: (tool) => ({ name: tool.name, summary: tool.summary, group: tool.group }),
+        }, catalogDeadline(rootRuntime)));
     }
     if (command === "describe") {
-        const name = positional[0] ?? getString(flags, "name") ?? getString(flags, "tool");
-        return dispatchTool("tools.describe", undefined, flags, runtime, requestId, { name });
+        const name = positional[0] ?? getString(flags, "name") ?? getString(flags, "tool") ?? "";
+        if (!name)
+            return failure(requestId, "TOOLS_DESCRIBE_NAME_REQUIRED", "Pass a tool name: unitycli tools describe <tool>.", ["Run unitycli tools group to see tool groups."]);
+        if (resolveCatalogIndependentOperabilityTool(name))
+            return projectCatalogDescribe(name, flags, runtime, requestId);
+        return dispatchCatalogProjection("catalog.describe", { name }, flags, runtime, requestId, (rootRuntime) => projectCatalogDescribe(name, flags, rootRuntime, requestId, catalogDeadline(rootRuntime)));
     }
     return failure(requestId, "UNKNOWN_TOOLS_COMMAND", "Expected tools group, tools group list <group>, tools describe <tool>, tools run <tool>, or tools search <k1|k2|...>.", [
         "Run unitycli tools group to see tool categories.",
-        "Run unitycli tools describe <tool> for full metadata."
+        "Run unitycli tools describe <tool> for full metadata.",
     ]);
 }
-/** 公开 Tool 参数只允许 JSON input 与明确命令控制项，未知 flag 不进入业务 schema。 */
+/** 公开 Tool 参数只允许 JSON input 与明确命令控制项。 */
 function rejectUnknownToolFlags(command, positional, flags, requestId) {
     const common = ["instance", "pretty"];
     const pagedDiscovery = command === "search" || command === "group" && positional[0] === "list";
@@ -40,13 +68,18 @@ function rejectUnknownToolFlags(command, positional, flags, requestId) {
     if (!unknown)
         return undefined;
     return failure(requestId, "E_UNKNOWN_OPTION", `Unknown option for tools ${command ?? ""}: --${unknown}.`, [
-        command === "run" ? "Put business fields inside --input <json>." : "Run unitycli --help for the supported options."
+        command === "run" ? "Put business fields inside --input <json>." : "Run unitycli --help for the supported options.",
     ], { option: `--${unknown}`, command: `tools ${command ?? ""}`.trim(), positional });
 }
 function pageSeed(flags) {
     return {
         ...(flags["page-size"] !== undefined ? { pageSize: Number(flags["page-size"]) } : {}),
-        ...(flags.cursor !== undefined ? { cursor: Number(flags.cursor) } : {}),
+        ...(typeof flags.cursor === "string" ? { cursor: flags.cursor } : {}),
     };
 }
+function catalogDeadline(runtime) {
+    return runtime.rootAdmissions?.editor?.executionAbsoluteDeadlineMs
+        ?? runtime.rootAdmissions?.runtime?.executionAbsoluteDeadlineMs
+        ?? runtime.rootAdmission?.executionAbsoluteDeadlineMs;
+}
 //# sourceMappingURL=commands.js.map

package/dist/tools/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/tools/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/tools/commands.ts"],"names":[],"mappings":"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"}

package/dist/tools/define.js

@@ -2,14 +2,15 @@
  * TS Tool 声明工厂与运行时注册表。
  * 一个能力文件默认导出一个 defineTool；公开 schema 由构建期从 Request/Result 类型生成并注入。
  */
+import { isRegisteredToolName, MAX_TOOL_NAME_UTF8_BYTES } from "../tool-name.js";
 const registry = new Map();
 /**
  * 声明一个 TS 工具。在 src/tools/<域>/<工具>.ts 中 `export default defineTool({...})`。
  * 返回原 definition(便于文件 default 导出)。
  */
 export function defineTool(definition) {
-    if (!definition.name)
-        throw new Error("defineTool requires name");
+    if (!isRegisteredToolName(definition.name))
+        throw new Error(`defineTool name must use the registered Tool syntax and fit ${MAX_TOOL_NAME_UTF8_BYTES} UTF-8 bytes`);
     if (registry.has(definition.name)) {
         throw new Error(`duplicate defineTool registration: ${definition.name}`);
     }

package/dist/tools/define.js.map

@@ -1 +1 @@
-{"version":3,"file":"define.js","sourceRoot":"","sources":["../../src/tools/define.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2EH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEnD;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAa,UAAsC;IAC3E,IAAI,CAAC,UAAU,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAClE,IAAI,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,sCAAsC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAA4B,EAAE,CAAC,CAAC;IAC5E,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,WAAoC,EAAE,YAAsC;IACzH,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;AACpC,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,kBAAkB;IAChC,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;YACpC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,cAAc,EAAE,CAAC,CAAC,cAAc;YAChC,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,aAAa,EAAE,CAAC,CAAC,aAAa;YAC9B,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;SACrC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;AACxC,CAAC"}
+{"version":3,"file":"define.js","sourceRoot":"","sources":["../../src/tools/define.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAyEjF,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEnD;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAa,UAAsC;IAC3E,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,wBAAwB,cAAc,CAAC,CAAC;IACnK,IAAI,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,sCAAsC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,UAA4B,EAAE,CAAC,CAAC;IAC5E,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,gBAAgB,CAAC,IAAY,EAAE,WAAoC,EAAE,YAAsC;IACzH,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAChC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;AACpC,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,kBAAkB;IAChC,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,QAAQ,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;YACpC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,eAAe,EAAE,CAAC,CAAC,eAAe;YAClC,cAAc,EAAE,CAAC,CAAC,cAAc;YAChC,SAAS,EAAE,CAAC,CAAC,SAAS;YACtB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,aAAa,EAAE,CAAC,CAAC,aAAa;YAC9B,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,gBAAgB,EAAE,CAAC,CAAC,gBAAgB;SACrC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;AACxC,CAAC"}

package/dist/tools/dispatcher.d.ts

@@ -1,4 +1,5 @@
-import { type BridgeRuntime } from "../bridge/index.js";
+import { SessionSupervisor, type BridgeRuntime, type DiscoveryProvenance, type RootAdmissionLease } from "../bridge/index.js";
+import { selectObservationInstanceForFlags, type InstanceTarget } from "../instances.js";
 import { EditorBlockerObserver } from "../editor-blocker-observer.js";
 import type { ProjectToolRuntime } from "../project-tool-discovery.js";
 import type { CliResult } from "../types.js";
@@ -11,17 +12,63 @@ export type ToolsRuntime = ProjectToolRuntime & Partial<BridgeRuntime> & {
         status: number;
         text: () => Promise<string>;
     }>;
+    /** 仅供隔离测试观察准入边界。 */
+    createSessionSupervisor?: (flags: Record<string, string | boolean>, runtime: BridgeRuntime) => SessionSupervisor;
+    /** live descriptor discovery 的调用级 exact session/listener provenance。 */
+    discoveryProvenances?: Partial<Record<InstanceTarget, DiscoveryProvenance>>;
+};
+export interface ToolInvocationContext {
+    readonly timeoutMs: number;
+    readonly admissionAbsoluteDeadlineMs: number;
+    readonly discoveryProvenances?: Partial<Record<InstanceTarget, DiscoveryProvenance>>;
+}
+/** command 与 tools run 在第一次 live discovery 前只创建一次顶层 admission deadline。 */
+export declare function beginToolInvocation(flags: Record<string, string | boolean>, requestId: string, timeoutMetadata?: Pick<ToolMetadata, "timeoutMs">, startedAtMs?: number): {
+    ok: true;
+    context: ToolInvocationContext;
+} | {
+    ok: false;
+    result: CliResult;
 };
 /**
  * Tool 分发顺序固定为输入解析、catalog 解析、schema 校验、目标选择、执行与 envelope。
  * 调用即授权，只保留 schema、目标与 descriptor 的正确性验证。
  */
-export declare function dispatchTool(name: string | undefined, positionalTarget: string | undefined, flags: Record<string, string | boolean>, runtime: ToolsRuntime, requestId: string, seed?: Record<string, unknown>, resolvedTool?: ToolMetadata): Promise<CliResult>;
+export declare function dispatchTool(name: string | undefined, positionalTarget: string | undefined, flags: Record<string, string | boolean>, runtime: ToolsRuntime, requestId: string, seed?: Record<string, unknown>, resolvedTool?: ToolMetadata, invocationContext?: ToolInvocationContext): Promise<CliResult>;
+/**
+ * live exact descriptor 在真实 catalog admission 上读取，并把 exact listener provenance 带回同一顶层调用。
+ * fixture 仍走相同 resolver，但没有伪造 registry identity。
+ */
+export declare function resolveCatalogToolForInvocation(name: string, flags: Record<string, string | boolean>, runtime: ToolsRuntime, requestId: string, context: ToolInvocationContext, fallbackName?: string): Promise<({
+    ok: true;
+    tool?: ToolMetadata;
+    context: ToolInvocationContext;
+}) | (CliResult & {
+    ok: false;
+})>;
 /** 公开统一catalog对每个在线target session分别占一个slot，禁止跨池旁路输出。 */
 export declare function dispatchCatalogProjection(command: string, input: Record<string, unknown>, flags: Record<string, string | boolean>, runtime: ToolsRuntime, requestId: string, execute: (rootRuntime: ToolsRuntime) => Promise<CliResult>): Promise<CliResult>;
-/** Tool自己的wait未按时settle时由框架结束CLI等待；已开始的Unity effect不因此停止。 */
-export declare function settleToolExecutionAtDeadline(toolName: string, requestId: string, mutation: boolean, absoluteDeadlineMs: number, run: () => Promise<CliResult>): Promise<CliResult>;
+/** 迟到cleanup只接管仍由CLI持有的未消费lease。 */
+export declare function completeUnconsumedRootAdmission(admission: RootAdmissionLease, supervisor: Pick<SessionSupervisor, "completeRootAdmission">): Promise<void>;
+/** 首个effect barrier在公开timeout后永久关闭；此前已跨过时保持原owner。 */
+export declare class LocalEffectBarrier {
+    private readonly toolName;
+    private readonly absoluteDeadlineMs;
+    private readonly now;
+    private closed;
+    private committed;
+    constructor(toolName: string, absoluteDeadlineMs: number, now?: () => number);
+    readonly commitEffect: () => Promise<void>;
+    readonly close: () => void;
+}
+export interface LocalExecutionDeadlineHooks {
+    closeEffectBarrier?: () => void;
+    cleanupAfterLateSettlement?: () => Promise<void>;
+    now?: () => number;
+}
+/** Tool自己的wait未按时settle时只关闭公开terminal；每次settlement只执行一次精确cleanup。 */
+export declare function settleToolExecutionAtDeadline(toolName: string, requestId: string, mutation: boolean, absoluteDeadlineMs: number, run: () => Promise<CliResult>, hooks?: LocalExecutionDeadlineHooks): Promise<CliResult>;
 /** TS Tool 的 terminal proof 与 C# driver 使用同一 execution-class 约束。 */
 export declare function validateLocalCompletionProof(toolName: string, completion: GeneratedToolCompletionContract | NonNullable<ToolMetadata["completionContract"]>, result: unknown, input?: Record<string, unknown>): void;
-/** Bridge wrappers may discard supervisor details; append one independent read-only modal diagnosis to target failures. */
-export declare function enrichTargetFailureWithDialogBlocker(result: CliResult, flags: Record<string, string | boolean>, runtime: ToolsRuntime, observer?: EditorBlockerObserver): Promise<CliResult>;
+/** Bridge wrapper失败只在原absolute deadline内追加一次有界modal诊断。 */
+export declare function enrichTargetFailureWithDialogBlocker(result: CliResult, flags: Record<string, string | boolean>, runtime: ToolsRuntime, absoluteDeadlineMs: number, observer?: EditorBlockerObserver, selectObservation?: typeof selectObservationInstanceForFlags, now?: () => number): Promise<CliResult>;