@introspection-ai/recipes 0.19.3 → 0.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -4
- package/dist/agents.d.ts +17 -1
- package/dist/agents.d.ts.map +1 -1
- package/dist/agents.js +15 -1
- package/dist/agents.js.map +1 -1
- package/dist/child-agent.d.ts +5 -1
- package/dist/child-agent.d.ts.map +1 -1
- package/dist/child-agent.js +34 -1
- package/dist/child-agent.js.map +1 -1
- package/dist/mcp-chunks/{auth-command-3K7V3VCW.js → auth-command-4OEOMU2V.js} +26 -38
- package/dist/mcp-chunks/call-arguments-RPXZJOXL.js +15 -0
- package/dist/mcp-chunks/{call-command-OFPHPFM5.js → call-command-AUEKSBMD.js} +74 -40
- package/dist/mcp-chunks/{chunk-NCXEJ35U.js → chunk-3VLPWGJL.js} +4 -4
- package/dist/mcp-chunks/{chunk-2FSDGCHW.js → chunk-47N2EELW.js} +377 -527
- package/dist/mcp-chunks/{chunk-WWO5WGH5.js → chunk-4NDR45CX.js} +5 -5
- package/dist/mcp-chunks/{chunk-2MEHGB7D.js → chunk-5WGJPYOR.js} +1 -1
- package/dist/mcp-chunks/chunk-6CYJ6RN3.js +12 -0
- package/dist/mcp-chunks/{chunk-XUF6KARU.js → chunk-6DL2C6V5.js} +1 -1
- package/dist/mcp-chunks/{chunk-54EWGONA.js → chunk-6QH47GNE.js} +10 -6
- package/dist/mcp-chunks/{chunk-PKOJCYNA.js → chunk-756YH7S4.js} +2 -2
- package/dist/mcp-chunks/{chunk-C2PQFLWS.js → chunk-7CS27CWE.js} +15 -6
- package/dist/mcp-chunks/{chunk-GIF7LOYU.js → chunk-7KEDX7SE.js} +2 -2
- package/dist/mcp-chunks/{chunk-LNSUME65.js → chunk-AB7MHBEG.js} +29 -13
- package/dist/mcp-chunks/{chunk-NZOIX6XW.js → chunk-ACTRQW5L.js} +2 -2
- package/dist/mcp-chunks/{chunk-7A63PAGP.js → chunk-ADINDBOF.js} +21 -5
- package/dist/mcp-chunks/{chunk-XTL4MHFH.js → chunk-AF74TOWM.js} +11 -7
- package/dist/mcp-chunks/{chunk-KSGYBW3F.js → chunk-AFKE4BTR.js} +72 -22
- package/dist/mcp-chunks/{chunk-YTKRAHO6.js → chunk-DEYKPG4K.js} +4 -4
- package/dist/mcp-chunks/{chunk-SB2UUURE.js → chunk-E4YYMOT2.js} +10 -10
- package/dist/mcp-chunks/{chunk-HAO6PL7Z.js → chunk-HBDCHBJP.js} +7 -7
- package/dist/mcp-chunks/{chunk-QJACOI2W.js → chunk-HDUKEFBI.js} +4 -2
- package/dist/mcp-chunks/{chunk-E6RVTWJY.js → chunk-HHMWZ2FZ.js} +1 -1
- package/dist/mcp-chunks/{chunk-HTZ2URXW.js → chunk-IPH6U7SE.js} +3 -3
- package/dist/mcp-chunks/{chunk-SFREPU3D.js → chunk-J3J3NQ4X.js} +1 -1
- package/dist/mcp-chunks/{chunk-JAKI24KR.js → chunk-J6VOMOKI.js} +1 -1
- package/dist/mcp-chunks/{chunk-H7F5RZXS.js → chunk-JILBFEBD.js} +2 -1
- package/dist/mcp-chunks/{chunk-YPJ5EHXR.js → chunk-K56RW4HB.js} +4 -4
- package/dist/mcp-chunks/{chunk-YCYSQA5V.js → chunk-KMH3PHLA.js} +5 -5
- package/dist/mcp-chunks/{chunk-2JHHONW4.js → chunk-KPXFBRTG.js} +1 -1
- package/dist/mcp-chunks/{chunk-LICH4Q7A.js → chunk-L4CUJJI5.js} +4 -4
- package/dist/mcp-chunks/{chunk-XRGLP3Z2.js → chunk-LC2CCTQN.js} +1 -1
- package/dist/mcp-chunks/{chunk-P3RN22HQ.js → chunk-LJCZWKGJ.js} +3 -2
- package/dist/mcp-chunks/{chunk-F3LL4EBL.js → chunk-MFFE5QSH.js} +1 -1
- package/dist/mcp-chunks/{chunk-64EP2BVO.js → chunk-MOML5C2E.js} +1 -1
- package/dist/mcp-chunks/{chunk-CNDY7WB4.js → chunk-MRXSXBZT.js} +2 -2
- package/dist/mcp-chunks/{chunk-WXBPMFSN.js → chunk-NMFI6AUD.js} +91 -34
- package/dist/mcp-chunks/{chunk-55JIHDU3.js → chunk-NWLOPQT7.js} +1 -1
- package/dist/mcp-chunks/{chunk-DXPHJFSA.js → chunk-OGFFBNIC.js} +4 -4
- package/dist/mcp-chunks/{chunk-7RDLPFIO.js → chunk-PPIXUCYQ.js} +2 -2
- package/dist/mcp-chunks/{chunk-RBVYCKCD.js → chunk-PPOHGQKM.js} +2 -2
- package/dist/mcp-chunks/{chunk-E6T37ED6.js → chunk-PRZCYXVO.js} +2 -2
- package/dist/mcp-chunks/{chunk-ETWN4IIA.js → chunk-Q7ESBNJG.js} +6 -6
- package/dist/mcp-chunks/{chunk-CA5WFJZA.js → chunk-RE4EVQNC.js} +1 -1
- package/dist/mcp-chunks/{chunk-6D6KPSXN.js → chunk-RO2Y34XX.js} +1 -1
- package/dist/mcp-chunks/{chunk-KSMY7PXI.js → chunk-SAK5KCLR.js} +1 -1
- package/dist/mcp-chunks/{chunk-UENXT3NE.js → chunk-SCGMRUKI.js} +1 -1
- package/dist/mcp-chunks/{chunk-3IZQW4H4.js → chunk-SQTXZR56.js} +212 -18
- package/dist/mcp-chunks/{chunk-FWP4RACK.js → chunk-TGJOZDKG.js} +2 -2
- package/dist/mcp-chunks/{chunk-DEUU7WSN.js → chunk-US57PK4B.js} +2 -2
- package/dist/mcp-chunks/{chunk-UHOKCTZT.js → chunk-V4RYLZM5.js} +1 -1
- package/dist/mcp-chunks/{chunk-GFYTST6N.js → chunk-X3FOKZ5C.js} +1 -1
- package/dist/mcp-chunks/{chunk-GSZOK5TS.js → chunk-XK3LRH3Q.js} +3 -3
- package/dist/mcp-chunks/chunk-XVJAASVZ.js +1931 -0
- package/dist/mcp-chunks/{chunk-ZBFZ5UFE.js → chunk-YX2NKW6O.js} +3 -1
- package/dist/mcp-chunks/{chunk-L4VKBFYI.js → chunk-Z7O6NF7X.js} +101 -16
- package/dist/mcp-chunks/{chunk-7DH57OKF.js → chunk-ZKFG37TB.js} +2 -2
- package/dist/mcp-chunks/chunk-ZRZ7C6L3.js +823 -0
- package/dist/mcp-chunks/{chunk-YSPT6F7K.js → chunk-ZZSD2JT7.js} +1 -1
- package/dist/mcp-chunks/{cli-E4P6SZLQ.js → cli-B7WQQUME.js} +70 -69
- package/dist/mcp-chunks/client-4ZHIBB67.js +21 -0
- package/dist/mcp-chunks/{config-command-MWF3RHPQ.js → config-command-FF3JPMOP.js} +27 -27
- package/dist/mcp-chunks/daemon-command-FKW6YELL.js +35 -0
- package/dist/mcp-chunks/{dist-ZIPUENTM.js → dist-V4UB7RTR.js} +547 -402
- package/dist/mcp-chunks/{emit-ts-command-GOVJJ64A.js → emit-ts-command-4X56IZ32.js} +16 -16
- package/dist/mcp-chunks/{generate-cli-runner-L5OQIMEY.js → generate-cli-runner-MIPF73SJ.js} +49 -42
- package/dist/mcp-chunks/{inspect-cli-command-7OMMREPE.js → inspect-cli-command-GX54ZXKR.js} +9 -9
- package/dist/mcp-chunks/{launch-BWXPLPB7.js → launch-E2LWGPZS.js} +1 -1
- package/dist/mcp-chunks/{lifecycle-B5UC65PT.js → lifecycle-TONHXXXJ.js} +1 -1
- package/dist/mcp-chunks/{list-command-ZO4HVFQK.js → list-command-YUGRZO4G.js} +31 -31
- package/dist/mcp-chunks/{output-utils-M3TJ2N4M.js → output-utils-AZY6N2VQ.js} +3 -3
- package/dist/mcp-chunks/{prompt-CH6TK0bC-C7OTKGRD.js → prompt-CH6TK0bC-NSBYYJZH.js} +1 -1
- package/dist/mcp-chunks/{record-command-VD3HUQIC.js → record-command-25DLELA2.js} +5 -5
- package/dist/mcp-chunks/{replay-command-AX6IN7YD.js → replay-command-6SLDG6PC.js} +6 -6
- package/dist/mcp-chunks/{resource-command-JEZ2DW2G.js → resource-command-YVOB4JCU.js} +9 -9
- package/dist/mcp-chunks/{result-utils-3YHYGS45.js → result-utils-ZXB5DM36.js} +3 -3
- package/dist/mcp-chunks/runtime-NOWGTHZ5.js +39 -0
- package/dist/mcp-chunks/{runtime-wrapper-UREU7GC3.js → runtime-wrapper-ZZPAFQE4.js} +6 -6
- package/dist/mcp-chunks/{serve-command-M47YZ6JN.js → serve-command-QYGM2AMB.js} +35 -27
- package/dist/mcp-chunks/{timeouts-THZRYP4B.js → timeouts-P3TBB3AX.js} +5 -3
- package/dist/mcp-chunks/{vault-command-53P7MLCB.js → vault-command-VDMPATIX.js} +58 -12
- package/dist/mcp-chunks/{webapi-PHEQZQKH.js → webapi-BLTNWSB2.js} +68 -60
- package/dist/mcp-daemon.js +30 -28
- package/dist/mcp-run-worker.js +30 -28
- package/dist/mcp.d.ts.map +1 -1
- package/dist/mcp.js +24 -0
- package/dist/mcp.js.map +1 -1
- package/dist/pi-extension.d.ts +3 -0
- package/dist/pi-extension.d.ts.map +1 -1
- package/dist/pi-extension.js +30 -22
- package/dist/pi-extension.js.map +1 -1
- package/dist/run-controller.d.ts +3 -1
- package/dist/run-controller.d.ts.map +1 -1
- package/dist/run-controller.js +17 -3
- package/dist/run-controller.js.map +1 -1
- package/dist/session.d.ts +3 -1
- package/dist/session.d.ts.map +1 -1
- package/dist/session.js +4 -1
- package/dist/session.js.map +1 -1
- package/docs/host-api.md +12 -0
- package/docs/pi-extension.md +18 -5
- package/package.json +20 -16
- package/dist/mcp-chunks/call-arguments-TX3F2TEE.js +0 -15
- package/dist/mcp-chunks/chunk-SRZZQ6TL.js +0 -266
- package/dist/mcp-chunks/client-2EJC4PLL.js +0 -18
- package/dist/mcp-chunks/daemon-command-6CJ26MKI.js +0 -33
- package/dist/mcp-chunks/runtime-HSYVOME7.js +0 -37
- package/dist/recipe-check.d.ts +0 -18
- package/dist/recipe-check.d.ts.map +0 -1
- package/dist/recipe-check.js +0 -263
- package/dist/recipe-check.js.map +0 -1
- package/vendor/introspection-recipe-check/darwin-arm64/introspection-recipe-check +0 -0
- package/vendor/introspection-recipe-check/darwin-x64/introspection-recipe-check +0 -0
- package/vendor/introspection-recipe-check/linux-arm64/introspection-recipe-check +0 -0
- package/vendor/introspection-recipe-check/linux-x64/introspection-recipe-check +0 -0
- package/vendor/introspection-recipe-check/linux-x64-musl/introspection-recipe-check +0 -0
- package/vendor/introspection-recipe-check/win32-x64/introspection-recipe-check.exe +0 -0
- package/vendor/mcp-client/darwin-arm64/mcp-client +0 -0
- package/vendor/mcp-client/darwin-x64/mcp-client +0 -0
- package/vendor/mcp-client/linux-arm64/mcp-client +0 -0
- package/vendor/mcp-client/linux-x64/mcp-client +0 -0
package/README.md
CHANGED
|
@@ -148,10 +148,11 @@ adapters and deployment cookbooks belong outside this package.
|
|
|
148
148
|
introspection check
|
|
149
149
|
```
|
|
150
150
|
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
151
|
+
Validation is an authoring and host concern, not a launch-time one. Run
|
|
152
|
+
`introspection check` while authoring and in CI; a host that executes Recipes
|
|
153
|
+
should validate before it starts a session, as the Introspection platform does
|
|
154
|
+
when a task is created. A `pi --recipe` launch does **not** re-validate, so a
|
|
155
|
+
Recipe that was never checked can start with errors the validator would catch.
|
|
155
156
|
|
|
156
157
|
## Documentation
|
|
157
158
|
|
package/dist/agents.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type ToolDefinition } from "@earendil-works/pi-coding-agent";
|
|
1
|
+
import { type AgentSessionEvent, type ToolDefinition } from "@earendil-works/pi-coding-agent";
|
|
2
2
|
/** Portable lifecycle contract for Recipe agent runs. */
|
|
3
3
|
export type AgentRunStatus = "running" | "completed" | "failed" | "interrupted" | "closed";
|
|
4
4
|
export interface AgentNestedToolSummary {
|
|
@@ -23,6 +23,22 @@ export interface AgentRunSummary {
|
|
|
23
23
|
output?: string;
|
|
24
24
|
error?: string;
|
|
25
25
|
}
|
|
26
|
+
/** Pi custom-entry type carrying one child run event. */
|
|
27
|
+
export declare const AGENT_RUN_EVENT_ENTRY_TYPE = "agent_run_event";
|
|
28
|
+
/** One canonical Pi event attributed to the child run that emitted it. */
|
|
29
|
+
export interface AgentRunEvent {
|
|
30
|
+
type: typeof AGENT_RUN_EVENT_ENTRY_TYPE;
|
|
31
|
+
agent_run_id: string;
|
|
32
|
+
parent_agent_run_id: string | null;
|
|
33
|
+
agent_name: string;
|
|
34
|
+
invocation_name: string;
|
|
35
|
+
depth: number;
|
|
36
|
+
event: AgentSessionEvent;
|
|
37
|
+
}
|
|
38
|
+
/** Host observer for child run events. Observers never own run lifecycle. */
|
|
39
|
+
export type AgentRunEventObserver = (event: AgentRunEvent) => void | Promise<void>;
|
|
40
|
+
/** Notify a host observer without allowing it to interrupt the child run. */
|
|
41
|
+
export declare function notifyAgentRunEvent(observer: AgentRunEventObserver | undefined, event: AgentRunEvent): void;
|
|
26
42
|
export interface AgentRunController {
|
|
27
43
|
list(): AgentRunSummary[];
|
|
28
44
|
get(id: string): AgentRunSummary | null;
|
package/dist/agents.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../src/agents.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../src/agents.ts"],"names":[],"mappings":"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"}
|
package/dist/agents.js
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
|
-
import { defineTool } from "@earendil-works/pi-coding-agent";
|
|
1
|
+
import { defineTool, } from "@earendil-works/pi-coding-agent";
|
|
2
2
|
import { Type } from "typebox";
|
|
3
|
+
/** Pi custom-entry type carrying one child run event. */
|
|
4
|
+
export const AGENT_RUN_EVENT_ENTRY_TYPE = "agent_run_event";
|
|
5
|
+
/** Notify a host observer without allowing it to interrupt the child run. */
|
|
6
|
+
export function notifyAgentRunEvent(observer, event) {
|
|
7
|
+
if (!observer)
|
|
8
|
+
return;
|
|
9
|
+
try {
|
|
10
|
+
void Promise.resolve(observer(event)).catch(() => { });
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
// Observation is detached from execution. A host hook must not turn a
|
|
14
|
+
// successful child event into a failed delegated run.
|
|
15
|
+
}
|
|
16
|
+
}
|
|
3
17
|
const AgentToolParams = Type.Object({
|
|
4
18
|
action: Type.Optional(Type.Union([
|
|
5
19
|
Type.Literal("start"),
|
package/dist/agents.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../src/agents.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"agents.js","sourceRoot":"","sources":["../src/agents.ts"],"names":[],"mappings":"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"}
|
package/dist/child-agent.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { CredentialStore } from "@earendil-works/pi-ai";
|
|
2
|
-
import { type ModelRegistry } from "@earendil-works/pi-coding-agent";
|
|
2
|
+
import { type AgentSessionEvent, type ModelRegistry } from "@earendil-works/pi-coding-agent";
|
|
3
3
|
import { type ResolvedRecipe } from "./recipe/resolve.js";
|
|
4
4
|
export interface CreateRecipeChildAgentRunnerOptions {
|
|
5
5
|
/** Immutable Recipe graph shared with the root Pi session. */
|
|
@@ -9,6 +9,8 @@ export interface CreateRecipeChildAgentRunnerOptions {
|
|
|
9
9
|
env?: NodeJS.ProcessEnv;
|
|
10
10
|
credentials?: CredentialStore;
|
|
11
11
|
modelRegistry?: ModelRegistry;
|
|
12
|
+
/** Observe the child's canonical Pi session events. */
|
|
13
|
+
onEvent?: (event: AgentSessionEvent) => void;
|
|
12
14
|
onAssistantMessage?: (text: string, stream: "delta" | "final") => void;
|
|
13
15
|
onToolEvent?: (event: RecipeChildToolEvent) => void;
|
|
14
16
|
}
|
|
@@ -39,6 +41,8 @@ export type RecipeChildToolEvent = {
|
|
|
39
41
|
result: unknown;
|
|
40
42
|
isError: boolean;
|
|
41
43
|
};
|
|
44
|
+
/** Return a terminal provider/session failure that Pi recorded as a message. */
|
|
45
|
+
export declare function promptResultError(result: unknown): string | null;
|
|
42
46
|
export declare function promptResultText(result: unknown): string;
|
|
43
47
|
export declare function createRecipeChildAgentRunner(opts: CreateRecipeChildAgentRunnerOptions): RecipeChildAgentRunner;
|
|
44
48
|
//# sourceMappingURL=child-agent.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-agent.d.ts","sourceRoot":"","sources":["../src/child-agent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"child-agent.d.ts","sourceRoot":"","sources":["../src/child-agent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAQzC,OAAO,EACL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,WAAW,mCAAmC;IAClD,8DAA8D;IAC9D,MAAM,EAAE,cAAc,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,uDAAuD;IACvD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;IAC7C,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,KAAK,IAAI,CAAC;IACvE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACxC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,MAAM,4BAA4B,GAAG,CACzC,IAAI,EAAE,mCAAmC,KACtC,sBAAsB,CAAC;AAE5B,MAAM,MAAM,oBAAoB,GAC5B;IACE,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;CACf,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,aAAa,EAAE,OAAO,CAAC;CACxB,GACD;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAoCN,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAWhE;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAcxD;AAqJD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,mCAAmC,GACxC,sBAAsB,CAExB"}
|
package/dist/child-agent.js
CHANGED
|
@@ -22,6 +22,34 @@ function contentText(content) {
|
|
|
22
22
|
.filter(Boolean)
|
|
23
23
|
.join("\n");
|
|
24
24
|
}
|
|
25
|
+
function latestAssistantMessage(result) {
|
|
26
|
+
if (!result || typeof result !== "object")
|
|
27
|
+
return null;
|
|
28
|
+
const record = result;
|
|
29
|
+
const messages = Array.isArray(record.messages) ? record.messages : [];
|
|
30
|
+
for (let index = messages.length - 1; index >= 0; index -= 1) {
|
|
31
|
+
const message = asRecord(messages[index]);
|
|
32
|
+
if (!message)
|
|
33
|
+
continue;
|
|
34
|
+
if (!message.role || message.role === "assistant")
|
|
35
|
+
return message;
|
|
36
|
+
}
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
/** Return a terminal provider/session failure that Pi recorded as a message. */
|
|
40
|
+
export function promptResultError(result) {
|
|
41
|
+
const message = latestAssistantMessage(result);
|
|
42
|
+
const stopReason = message?.stopReason;
|
|
43
|
+
if (stopReason !== "error" && stopReason !== "aborted")
|
|
44
|
+
return null;
|
|
45
|
+
const errorMessage = message?.errorMessage;
|
|
46
|
+
if (typeof errorMessage === "string" && errorMessage.trim()) {
|
|
47
|
+
return errorMessage.trim();
|
|
48
|
+
}
|
|
49
|
+
return stopReason === "aborted"
|
|
50
|
+
? "Child agent model request was aborted"
|
|
51
|
+
: "Child agent model request failed";
|
|
52
|
+
}
|
|
25
53
|
export function promptResultText(result) {
|
|
26
54
|
if (typeof result === "string")
|
|
27
55
|
return result;
|
|
@@ -68,6 +96,7 @@ class RecipeChildAgentSessionRunner {
|
|
|
68
96
|
this.assistantStreamedText = true;
|
|
69
97
|
}
|
|
70
98
|
handleSessionEvent(event) {
|
|
99
|
+
this.opts.onEvent?.(event);
|
|
71
100
|
const record = asRecord(event);
|
|
72
101
|
const message = messageFromEvent(event);
|
|
73
102
|
const role = typeof message?.role === "string" ? message.role : undefined;
|
|
@@ -154,7 +183,11 @@ class RecipeChildAgentSessionRunner {
|
|
|
154
183
|
// Resolve their approval tools internally so they cannot open UI or emit
|
|
155
184
|
// an interrupt that would strand the child waiting for the root user.
|
|
156
185
|
await autoResolveInteractions(() => this.session.prompt(prompt));
|
|
157
|
-
|
|
186
|
+
const result = { messages: [...this.session.messages] };
|
|
187
|
+
const error = promptResultError(result);
|
|
188
|
+
if (error)
|
|
189
|
+
throw new Error(error);
|
|
190
|
+
return promptResultText(result);
|
|
158
191
|
}
|
|
159
192
|
async steer(message) {
|
|
160
193
|
await this.start();
|
package/dist/child-agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-agent.js","sourceRoot":"","sources":["../src/child-agent.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kCAAkC,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"child-agent.js","sourceRoot":"","sources":["../src/child-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,53 +3,54 @@ import {
|
|
|
3
3
|
getActiveLogger,
|
|
4
4
|
logInfo,
|
|
5
5
|
logWarn
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-PPOHGQKM.js";
|
|
7
7
|
import {
|
|
8
8
|
persistPreparedEphemeralServer,
|
|
9
9
|
prepareEphemeralServerTarget,
|
|
10
10
|
renderAdhocServerHelpLines
|
|
11
|
-
} from "./chunk-
|
|
12
|
-
import "./chunk-
|
|
13
|
-
import "./chunk-
|
|
11
|
+
} from "./chunk-KMH3PHLA.js";
|
|
12
|
+
import "./chunk-7KEDX7SE.js";
|
|
13
|
+
import "./chunk-4NDR45CX.js";
|
|
14
14
|
import {
|
|
15
15
|
buildConnectionIssueEnvelope
|
|
16
|
-
} from "./chunk-
|
|
16
|
+
} from "./chunk-SAK5KCLR.js";
|
|
17
17
|
import {
|
|
18
18
|
extractEphemeralServerFlags
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-NWLOPQT7.js";
|
|
20
20
|
import {
|
|
21
21
|
looksLikeHttpUrl
|
|
22
|
-
} from "./chunk-
|
|
22
|
+
} from "./chunk-SCGMRUKI.js";
|
|
23
23
|
import {
|
|
24
24
|
consumeOutputFormat
|
|
25
|
-
} from "./chunk-
|
|
25
|
+
} from "./chunk-MFFE5QSH.js";
|
|
26
26
|
import {
|
|
27
27
|
isOAuthFlowError,
|
|
28
28
|
resolveOAuthTimeoutFromEnv
|
|
29
|
-
} from "./chunk-
|
|
29
|
+
} from "./chunk-ZRZ7C6L3.js";
|
|
30
30
|
import {
|
|
31
31
|
clearOAuthCaches
|
|
32
|
-
} from "./chunk-
|
|
33
|
-
import "./chunk-
|
|
34
|
-
import "./chunk-
|
|
35
|
-
import "./chunk-
|
|
32
|
+
} from "./chunk-SQTXZR56.js";
|
|
33
|
+
import "./chunk-7CS27CWE.js";
|
|
34
|
+
import "./chunk-ZKFG37TB.js";
|
|
35
|
+
import "./chunk-X3FOKZ5C.js";
|
|
36
36
|
import {
|
|
37
37
|
analyzeConnectionError
|
|
38
|
-
} from "./chunk-
|
|
39
|
-
import "./chunk-
|
|
40
|
-
import
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
import "./chunk-
|
|
44
|
-
import "./chunk-
|
|
45
|
-
import "./chunk-
|
|
38
|
+
} from "./chunk-US57PK4B.js";
|
|
39
|
+
import "./chunk-K56RW4HB.js";
|
|
40
|
+
import {
|
|
41
|
+
suppressBrowserLaunchFromEnv
|
|
42
|
+
} from "./chunk-6CYJ6RN3.js";
|
|
43
|
+
import "./chunk-Z7O6NF7X.js";
|
|
44
|
+
import "./chunk-ADINDBOF.js";
|
|
45
|
+
import "./chunk-IPH6U7SE.js";
|
|
46
|
+
import "./chunk-TGJOZDKG.js";
|
|
47
|
+
import "./chunk-HBDCHBJP.js";
|
|
48
|
+
import "./chunk-RO2Y34XX.js";
|
|
46
49
|
import "./chunk-LWVFSQYX.js";
|
|
47
50
|
import "./chunk-LRKZP7DJ.js";
|
|
48
51
|
|
|
49
|
-
// node_modules/.pnpm/mcporter@0.13.
|
|
52
|
+
// node_modules/.pnpm/mcporter@0.13.7/node_modules/mcporter/dist/cli/auth-command.js
|
|
50
53
|
import { spawn } from "node:child_process";
|
|
51
|
-
var TRUE_VALUES = /* @__PURE__ */ new Set(["1", "true", "yes"]);
|
|
52
|
-
var FALSE_VALUES = /* @__PURE__ */ new Set(["0", "false", "no"]);
|
|
53
54
|
async function handleAuth(runtime, args, options = {}) {
|
|
54
55
|
const browserSuppression = consumeBrowserSuppression(args, process.env);
|
|
55
56
|
const noBrowser = browserSuppression === "no-browser";
|
|
@@ -198,7 +199,7 @@ function buildNoBrowserOAuthOptions(format, markAuthorizationOutputEmitted) {
|
|
|
198
199
|
};
|
|
199
200
|
}
|
|
200
201
|
function consumeBrowserSuppression(args, env) {
|
|
201
|
-
let mode =
|
|
202
|
+
let mode = suppressBrowserLaunchFromEnv(env) ? "no-browser" : "default";
|
|
202
203
|
const noBrowserIndex = args.indexOf("--no-browser");
|
|
203
204
|
if (noBrowserIndex !== -1) {
|
|
204
205
|
args.splice(noBrowserIndex, 1);
|
|
@@ -218,19 +219,6 @@ function consumeBrowserSuppression(args, env) {
|
|
|
218
219
|
}
|
|
219
220
|
return mode;
|
|
220
221
|
}
|
|
221
|
-
function resolveBrowserSuppressionFromEnv(raw) {
|
|
222
|
-
if (raw === void 0) {
|
|
223
|
-
return "default";
|
|
224
|
-
}
|
|
225
|
-
const normalized = raw.trim().toLowerCase();
|
|
226
|
-
if (!normalized || FALSE_VALUES.has(normalized)) {
|
|
227
|
-
return "default";
|
|
228
|
-
}
|
|
229
|
-
if (TRUE_VALUES.has(normalized)) {
|
|
230
|
-
return "no-browser";
|
|
231
|
-
}
|
|
232
|
-
return "default";
|
|
233
|
-
}
|
|
234
222
|
function shouldRetryAuthError(error) {
|
|
235
223
|
if (isOAuthFlowError(error)) {
|
|
236
224
|
return false;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
|
|
2
|
+
import {
|
|
3
|
+
parseCallArguments
|
|
4
|
+
} from "./chunk-AB7MHBEG.js";
|
|
5
|
+
import "./chunk-KPXFBRTG.js";
|
|
6
|
+
import "./chunk-HDUKEFBI.js";
|
|
7
|
+
import "./chunk-NWLOPQT7.js";
|
|
8
|
+
import "./chunk-SCGMRUKI.js";
|
|
9
|
+
import "./chunk-MFFE5QSH.js";
|
|
10
|
+
import "./chunk-Q7ESBNJG.js";
|
|
11
|
+
import "./chunk-HBDCHBJP.js";
|
|
12
|
+
import "./chunk-LRKZP7DJ.js";
|
|
13
|
+
export {
|
|
14
|
+
parseCallArguments
|
|
15
|
+
};
|
|
@@ -1,72 +1,76 @@
|
|
|
1
1
|
import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
|
|
2
2
|
import {
|
|
3
3
|
dumpActiveHandles
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-PPIXUCYQ.js";
|
|
5
5
|
import {
|
|
6
6
|
CALL_HELP_ARGUMENT_LINES,
|
|
7
7
|
CALL_HELP_EXAMPLE_LINES,
|
|
8
8
|
CALL_HELP_RUNTIME_FLAG_LINES,
|
|
9
|
+
buildUnknownCallFlagMessage,
|
|
10
|
+
buildUnvalidatedCallFlagMessage,
|
|
9
11
|
parseCallArguments
|
|
10
|
-
} from "./chunk-
|
|
11
|
-
import
|
|
12
|
+
} from "./chunk-AB7MHBEG.js";
|
|
13
|
+
import {
|
|
14
|
+
CliUsageError
|
|
15
|
+
} from "./chunk-KPXFBRTG.js";
|
|
12
16
|
import {
|
|
13
17
|
printCallOutput,
|
|
14
18
|
tailLogIfRequested
|
|
15
|
-
} from "./chunk-
|
|
16
|
-
import "./chunk-
|
|
19
|
+
} from "./chunk-MRXSXBZT.js";
|
|
20
|
+
import "./chunk-PPOHGQKM.js";
|
|
17
21
|
import {
|
|
18
22
|
loadToolMetadata
|
|
19
|
-
} from "./chunk-
|
|
23
|
+
} from "./chunk-756YH7S4.js";
|
|
20
24
|
import {
|
|
21
25
|
chooseClosestIdentifier,
|
|
22
26
|
normalizeIdentifier,
|
|
23
27
|
renderIdentifierResolutionMessages
|
|
24
|
-
} from "./chunk-
|
|
25
|
-
import "./chunk-
|
|
28
|
+
} from "./chunk-J6VOMOKI.js";
|
|
29
|
+
import "./chunk-LJCZWKGJ.js";
|
|
26
30
|
import {
|
|
27
31
|
dimText,
|
|
28
32
|
redText,
|
|
29
33
|
yellowText
|
|
30
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-6DL2C6V5.js";
|
|
31
35
|
import {
|
|
32
36
|
resolveCallTimeout,
|
|
33
37
|
withTimeout
|
|
34
|
-
} from "./chunk-
|
|
38
|
+
} from "./chunk-HDUKEFBI.js";
|
|
35
39
|
import {
|
|
36
40
|
persistPreparedEphemeralServer,
|
|
37
41
|
prepareEphemeralServerTarget,
|
|
38
42
|
renderAdhocServerHelpLines
|
|
39
|
-
} from "./chunk-
|
|
40
|
-
import "./chunk-
|
|
41
|
-
import "./chunk-
|
|
43
|
+
} from "./chunk-KMH3PHLA.js";
|
|
44
|
+
import "./chunk-7KEDX7SE.js";
|
|
45
|
+
import "./chunk-4NDR45CX.js";
|
|
42
46
|
import {
|
|
43
47
|
buildConnectionIssueEnvelope
|
|
44
|
-
} from "./chunk-
|
|
45
|
-
import "./chunk-
|
|
48
|
+
} from "./chunk-SAK5KCLR.js";
|
|
49
|
+
import "./chunk-NWLOPQT7.js";
|
|
46
50
|
import {
|
|
47
51
|
looksLikeHttpUrl,
|
|
48
52
|
normalizeHttpUrlCandidate
|
|
49
|
-
} from "./chunk-
|
|
50
|
-
import "./chunk-
|
|
53
|
+
} from "./chunk-SCGMRUKI.js";
|
|
54
|
+
import "./chunk-MFFE5QSH.js";
|
|
51
55
|
import {
|
|
52
56
|
wrapCallResult
|
|
53
|
-
} from "./chunk-
|
|
54
|
-
import "./chunk-
|
|
55
|
-
import "./chunk-ETWN4IIA.js";
|
|
57
|
+
} from "./chunk-ACTRQW5L.js";
|
|
58
|
+
import "./chunk-X3FOKZ5C.js";
|
|
56
59
|
import {
|
|
57
60
|
analyzeConnectionError
|
|
58
|
-
} from "./chunk-
|
|
59
|
-
import "./chunk-
|
|
60
|
-
import "./chunk-
|
|
61
|
-
import "./chunk-
|
|
62
|
-
import "./chunk-
|
|
63
|
-
import "./chunk-
|
|
64
|
-
import "./chunk-
|
|
65
|
-
import "./chunk-
|
|
61
|
+
} from "./chunk-US57PK4B.js";
|
|
62
|
+
import "./chunk-K56RW4HB.js";
|
|
63
|
+
import "./chunk-Q7ESBNJG.js";
|
|
64
|
+
import "./chunk-Z7O6NF7X.js";
|
|
65
|
+
import "./chunk-ADINDBOF.js";
|
|
66
|
+
import "./chunk-IPH6U7SE.js";
|
|
67
|
+
import "./chunk-TGJOZDKG.js";
|
|
68
|
+
import "./chunk-HBDCHBJP.js";
|
|
69
|
+
import "./chunk-RO2Y34XX.js";
|
|
66
70
|
import "./chunk-LWVFSQYX.js";
|
|
67
71
|
import "./chunk-LRKZP7DJ.js";
|
|
68
72
|
|
|
69
|
-
// node_modules/.pnpm/mcporter@0.13.
|
|
73
|
+
// node_modules/.pnpm/mcporter@0.13.7/node_modules/mcporter/dist/cli/image-output.js
|
|
70
74
|
import fs from "node:fs";
|
|
71
75
|
import path from "node:path";
|
|
72
76
|
function saveCallImagesIfRequested(wrapped, outputDir) {
|
|
@@ -124,7 +128,7 @@ function resolveImageOutputPath(outputDir, baseName, extension) {
|
|
|
124
128
|
}
|
|
125
129
|
}
|
|
126
130
|
|
|
127
|
-
// node_modules/.pnpm/mcporter@0.13.
|
|
131
|
+
// node_modules/.pnpm/mcporter@0.13.7/node_modules/mcporter/dist/cli/call-command.js
|
|
128
132
|
async function handleCall(runtime, args) {
|
|
129
133
|
let prepared;
|
|
130
134
|
try {
|
|
@@ -150,7 +154,7 @@ async function prepareCallRequest(runtime, args) {
|
|
|
150
154
|
}
|
|
151
155
|
const timeoutMs = resolveCallTimeout(parsed.timeoutMs);
|
|
152
156
|
const hydratedArgs = await hydratePositionalArguments(runtime, server, tool, parsed.args, parsed.positionalArgs, parsed.disableOAuth);
|
|
153
|
-
const schemaAwareArgs = await enforceSchemaAwareArgumentTypes(runtime, server, tool, hydratedArgs, parsed.schemaStringCoercionCandidates, parsed.schemaArrayCoercionCandidates, timeoutMs, parsed.disableOAuth);
|
|
157
|
+
const schemaAwareArgs = await enforceSchemaAwareArgumentTypes(runtime, server, tool, hydratedArgs, parsed.schemaStringCoercionCandidates, parsed.schemaArrayCoercionCandidates, parsed.genericLongFlagArguments, timeoutMs, parsed.disableOAuth);
|
|
154
158
|
return {
|
|
155
159
|
parsed,
|
|
156
160
|
server,
|
|
@@ -291,7 +295,7 @@ async function maybeDescribeServer(runtime, server, tool, outputFormat, disableO
|
|
|
291
295
|
if (outputFormat === "json") {
|
|
292
296
|
listArgs2.push("--json");
|
|
293
297
|
}
|
|
294
|
-
const { handleList: handleList2 } = await import("./list-command-
|
|
298
|
+
const { handleList: handleList2 } = await import("./list-command-YUGRZO4G.js");
|
|
295
299
|
await handleList2(runtime, listArgs2);
|
|
296
300
|
return true;
|
|
297
301
|
}
|
|
@@ -314,7 +318,7 @@ async function maybeDescribeServer(runtime, server, tool, outputFormat, disableO
|
|
|
314
318
|
if (outputFormat === "json") {
|
|
315
319
|
listArgs.push("--json");
|
|
316
320
|
}
|
|
317
|
-
const { handleList } = await import("./list-command-
|
|
321
|
+
const { handleList } = await import("./list-command-YUGRZO4G.js");
|
|
318
322
|
await handleList(runtime, listArgs);
|
|
319
323
|
return true;
|
|
320
324
|
}
|
|
@@ -349,17 +353,38 @@ function splitServerToolSelector(selector) {
|
|
|
349
353
|
tool: selector.slice(dotIndex + 1)
|
|
350
354
|
};
|
|
351
355
|
}
|
|
352
|
-
async function enforceSchemaAwareArgumentTypes(runtime, server, tool, args, stringCandidates, arrayCandidates, timeoutMs, disableOAuth) {
|
|
353
|
-
|
|
356
|
+
async function enforceSchemaAwareArgumentTypes(runtime, server, tool, args, stringCandidates, arrayCandidates, genericLongFlagArguments, timeoutMs, disableOAuth) {
|
|
357
|
+
const requiresFlagValidation = (genericLongFlagArguments?.length ?? 0) > 0;
|
|
358
|
+
if (!requiresFlagValidation && (!stringCandidates || Object.keys(stringCandidates).length === 0) && (!arrayCandidates || Object.keys(arrayCandidates).length === 0)) {
|
|
354
359
|
return args;
|
|
355
360
|
}
|
|
356
|
-
|
|
361
|
+
let tools;
|
|
362
|
+
try {
|
|
363
|
+
tools = await withTimeout(loadToolMetadata(runtime, server, { includeSchema: true, disableOAuth }), timeoutMs);
|
|
364
|
+
} catch {
|
|
365
|
+
if (requiresFlagValidation) {
|
|
366
|
+
throw new CliUsageError(buildUnvalidatedCallFlagMessage(genericLongFlagArguments?.[0]?.token ?? "--", server, tool));
|
|
367
|
+
}
|
|
368
|
+
}
|
|
357
369
|
if (!tools) {
|
|
358
370
|
return args;
|
|
359
371
|
}
|
|
360
372
|
const toolInfo = tools.find((entry) => entry.tool.name === tool);
|
|
361
373
|
const schema = toolInfo?.tool.inputSchema;
|
|
362
|
-
|
|
374
|
+
const schemaProperties = readSchemaProperties(schema);
|
|
375
|
+
const declaredOptions = new Set(toolInfo?.options.map((option) => option.property) ?? []);
|
|
376
|
+
for (const key of Object.keys(schemaProperties ?? {})) {
|
|
377
|
+
declaredOptions.add(key);
|
|
378
|
+
}
|
|
379
|
+
if (requiresFlagValidation && (!toolInfo || !schemaProperties && declaredOptions.size === 0)) {
|
|
380
|
+
throw new CliUsageError(buildUnvalidatedCallFlagMessage(genericLongFlagArguments?.[0]?.token ?? "--", server, tool));
|
|
381
|
+
}
|
|
382
|
+
for (const flag of genericLongFlagArguments ?? []) {
|
|
383
|
+
if (!declaredOptions.has(flag.key)) {
|
|
384
|
+
throw new CliUsageError(buildUnknownCallFlagMessage(flag.token));
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
if (!schemaProperties) {
|
|
363
388
|
return args;
|
|
364
389
|
}
|
|
365
390
|
let corrected;
|
|
@@ -367,7 +392,7 @@ async function enforceSchemaAwareArgumentTypes(runtime, server, tool, args, stri
|
|
|
367
392
|
if (typeof args[key] !== "number") {
|
|
368
393
|
continue;
|
|
369
394
|
}
|
|
370
|
-
if (!schemaAllowsString(
|
|
395
|
+
if (!schemaAllowsString(schemaProperties[key])) {
|
|
371
396
|
continue;
|
|
372
397
|
}
|
|
373
398
|
corrected ??= { ...args };
|
|
@@ -377,7 +402,7 @@ async function enforceSchemaAwareArgumentTypes(runtime, server, tool, args, stri
|
|
|
377
402
|
if (typeof args[key] !== "string") {
|
|
378
403
|
continue;
|
|
379
404
|
}
|
|
380
|
-
const descriptor =
|
|
405
|
+
const descriptor = schemaProperties[key];
|
|
381
406
|
if (!schemaAllowsArray(descriptor) || schemaAllowsString(descriptor)) {
|
|
382
407
|
continue;
|
|
383
408
|
}
|
|
@@ -386,6 +411,16 @@ async function enforceSchemaAwareArgumentTypes(runtime, server, tool, args, stri
|
|
|
386
411
|
}
|
|
387
412
|
return corrected ?? args;
|
|
388
413
|
}
|
|
414
|
+
function readSchemaProperties(schema) {
|
|
415
|
+
if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
|
|
416
|
+
return void 0;
|
|
417
|
+
}
|
|
418
|
+
const properties = schema.properties;
|
|
419
|
+
if (!properties || typeof properties !== "object" || Array.isArray(properties)) {
|
|
420
|
+
return void 0;
|
|
421
|
+
}
|
|
422
|
+
return properties;
|
|
423
|
+
}
|
|
389
424
|
function schemaAllowsString(descriptor) {
|
|
390
425
|
if (!descriptor || typeof descriptor !== "object") {
|
|
391
426
|
return false;
|
|
@@ -499,7 +534,6 @@ async function attemptCall(runtime, server, tool, args, timeoutMs, outputFormat,
|
|
|
499
534
|
}
|
|
500
535
|
const resolution = await maybeResolveToolName(runtime, server, tool, error, disableOAuth);
|
|
501
536
|
if (!resolution) {
|
|
502
|
-
maybeReportConnectionIssue(server, tool, error);
|
|
503
537
|
throw error;
|
|
504
538
|
}
|
|
505
539
|
const retry = await maybeRetryResolvedTool(runtime, server, tool, args, timeoutMs, outputFormat, resolution, disableOAuth);
|
|
@@ -4,12 +4,12 @@ import {
|
|
|
4
4
|
extraDimText,
|
|
5
5
|
redText,
|
|
6
6
|
yellowText
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-6DL2C6V5.js";
|
|
8
8
|
import {
|
|
9
9
|
analyzeConnectionError
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-US57PK4B.js";
|
|
11
11
|
|
|
12
|
-
// node_modules/.pnpm/mcporter@0.13.
|
|
12
|
+
// node_modules/.pnpm/mcporter@0.13.7/node_modules/mcporter/dist/cli/path-utils.js
|
|
13
13
|
import os from "node:os";
|
|
14
14
|
import path from "node:path";
|
|
15
15
|
function formatPathForDisplay(filePath) {
|
|
@@ -19,7 +19,7 @@ function formatPathForDisplay(filePath) {
|
|
|
19
19
|
return displayPath;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
// node_modules/.pnpm/mcporter@0.13.
|
|
22
|
+
// node_modules/.pnpm/mcporter@0.13.7/node_modules/mcporter/dist/cli/list-format.js
|
|
23
23
|
function renderServerListRow(result, timeoutMs, options = {}) {
|
|
24
24
|
const description = result.server.description ? dimText(` \u2014 ${result.server.description}`) : "";
|
|
25
25
|
const durationLabel = dimText(`${(result.durationMs / 1e3).toFixed(1)}s`);
|