@bastani/atomic 0.8.25 → 0.8.26-alpha.2
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/CHANGELOG.md +18 -0
- package/dist/builtin/intercom/CHANGELOG.md +12 -0
- package/dist/builtin/intercom/index-heavy.ts +1754 -0
- package/dist/builtin/intercom/index.ts +374 -1746
- package/dist/builtin/intercom/package.json +1 -1
- package/dist/builtin/intercom/result-renderers.ts +77 -0
- package/dist/builtin/mcp/CHANGELOG.md +16 -0
- package/dist/builtin/mcp/index.ts +151 -57
- package/dist/builtin/mcp/package.json +1 -1
- package/dist/builtin/subagents/CHANGELOG.md +13 -0
- package/dist/builtin/subagents/package.json +1 -1
- package/dist/builtin/subagents/src/runs/background/subagent-runner.ts +8 -3
- package/dist/builtin/subagents/src/runs/foreground/execution.ts +42 -4
- package/dist/builtin/subagents/src/runs/shared/acceptance.ts +2 -1
- package/dist/builtin/subagents/src/runs/shared/worktree.ts +2 -2
- package/dist/builtin/web-access/CHANGELOG.md +12 -0
- package/dist/builtin/web-access/index-heavy.ts +2060 -0
- package/dist/builtin/web-access/index.ts +182 -2274
- package/dist/builtin/web-access/package.json +1 -1
- package/dist/builtin/web-access/result-renderers.ts +364 -0
- package/dist/builtin/workflows/CHANGELOG.md +21 -0
- package/dist/builtin/workflows/package.json +1 -1
- package/dist/builtin/workflows/skills/research-codebase/SKILL.md +28 -9
- package/dist/builtin/workflows/src/extension/index.ts +13 -3
- package/dist/builtin/workflows/src/runs/foreground/stage-runner.ts +59 -3
- package/dist/builtin/workflows/src/runs/shared/worktree.ts +2 -2
- package/dist/builtin/workflows/src/shared/store.ts +61 -7
- package/dist/builtin/workflows/src/tui/inline-form-overlay.ts +12 -3
- package/dist/builtin/workflows/src/tui/inline-form-store.ts +17 -6
- package/dist/builtin/workflows/src/tui/stage-chat-view.ts +37 -2
- package/dist/core/agent-session-services.d.ts.map +1 -1
- package/dist/core/agent-session-services.js +13 -0
- package/dist/core/agent-session-services.js.map +1 -1
- package/dist/core/extensions/loader.d.ts.map +1 -1
- package/dist/core/extensions/loader.js +7 -0
- package/dist/core/extensions/loader.js.map +1 -1
- package/dist/core/extensions/types.d.ts +13 -1
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/core/footer-data-provider.d.ts.map +1 -1
- package/dist/core/footer-data-provider.js +3 -0
- package/dist/core/footer-data-provider.js.map +1 -1
- package/dist/core/package-manager.d.ts.map +1 -1
- package/dist/core/package-manager.js +14 -7
- package/dist/core/package-manager.js.map +1 -1
- package/dist/core/resource-loader.d.ts.map +1 -1
- package/dist/core/resource-loader.js +17 -0
- package/dist/core/resource-loader.js.map +1 -1
- package/dist/core/timings.d.ts +9 -0
- package/dist/core/timings.d.ts.map +1 -1
- package/dist/core/timings.js +28 -1
- package/dist/core/timings.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +4 -2
- package/dist/main.js.map +1 -1
- package/dist/modes/interactive/components/custom-message.d.ts +1 -0
- package/dist/modes/interactive/components/custom-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/custom-message.js +36 -4
- package/dist/modes/interactive/components/custom-message.js.map +1 -1
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +4 -1
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +22 -9
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/utils/git-env.d.ts +10 -0
- package/dist/utils/git-env.d.ts.map +1 -0
- package/dist/utils/git-env.js +33 -0
- package/dist/utils/git-env.js.map +1 -0
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
|
|
|
2
2
|
import * as fs from "node:fs";
|
|
3
3
|
import * as os from "node:os";
|
|
4
4
|
import * as path from "node:path";
|
|
5
|
-
import { APP_NAME } from "@bastani/atomic";
|
|
5
|
+
import { APP_NAME, createGitEnvironment } from "@bastani/atomic";
|
|
6
6
|
|
|
7
7
|
export interface WorktreeSetup {
|
|
8
8
|
cwd: string;
|
|
@@ -110,7 +110,7 @@ function runGit(cwd: string, args: string[]): GitResult {
|
|
|
110
110
|
], {
|
|
111
111
|
cwd,
|
|
112
112
|
encoding: "utf-8",
|
|
113
|
-
env: {
|
|
113
|
+
env: createGitEnvironment({ GIT_OPTIONAL_LOCKS: "0" }),
|
|
114
114
|
timeout: 5000,
|
|
115
115
|
});
|
|
116
116
|
return {
|
|
@@ -151,6 +151,16 @@ export interface Store {
|
|
|
151
151
|
): boolean;
|
|
152
152
|
/** Wait for a stage/node-scoped HIL prompt to resolve. */
|
|
153
153
|
awaitStagePendingPrompt(runId: string, stageId: string, promptId: string): Promise<unknown>;
|
|
154
|
+
/**
|
|
155
|
+
* Record a live-only draft for an active stage-local input/editor prompt.
|
|
156
|
+
* Draft text may contain secrets and must never be copied into snapshots,
|
|
157
|
+
* status output, logs, notifications, or persisted metadata.
|
|
158
|
+
*/
|
|
159
|
+
recordStagePromptDraft(runId: string, stageId: string, promptId: string, text: string): boolean;
|
|
160
|
+
/** Return a live-only draft for an active stage-local input/editor prompt, if present. */
|
|
161
|
+
getStagePromptDraft(runId: string, stageId: string, promptId: string): string | undefined;
|
|
162
|
+
/** Clear a live-only draft for a stage-local prompt. */
|
|
163
|
+
clearStagePromptDraft(runId: string, stageId: string, promptId: string): boolean;
|
|
154
164
|
/**
|
|
155
165
|
* Return the live-only prompt answer record for a completed prompt stage, if
|
|
156
166
|
* still available. The returned value may contain secrets and must never be
|
|
@@ -239,6 +249,7 @@ export function createStore(): Store {
|
|
|
239
249
|
const _notices: WorkflowNotice[] = [];
|
|
240
250
|
const _listeners: Set<(snap: StoreSnapshot) => void> = new Set();
|
|
241
251
|
const _stagePromptAnswers = new Map<string, PromptAnswerRecord>();
|
|
252
|
+
const _stagePromptDrafts = new Map<string, string>();
|
|
242
253
|
let _version = 0;
|
|
243
254
|
|
|
244
255
|
/**
|
|
@@ -285,16 +296,36 @@ export function createStore(): Store {
|
|
|
285
296
|
return JSON.stringify([runId, stageId]);
|
|
286
297
|
}
|
|
287
298
|
|
|
288
|
-
function
|
|
299
|
+
function stagePromptDraftKey(runId: string, stageId: string, promptId: string): string {
|
|
300
|
+
return JSON.stringify([runId, stageId, promptId]);
|
|
301
|
+
}
|
|
302
|
+
|
|
303
|
+
function stageHasActiveTextPrompt(
|
|
304
|
+
runId: string,
|
|
305
|
+
stageId: string,
|
|
306
|
+
promptId: string,
|
|
307
|
+
): { prompt: PendingPrompt } | undefined {
|
|
308
|
+
const run = findRun(runId);
|
|
309
|
+
if (!run || TERMINAL_STATUSES.has(run.status)) return undefined;
|
|
310
|
+
const stage = findStage(run, stageId);
|
|
311
|
+
if (!stage || isTerminalStageStatus(stage.status)) return undefined;
|
|
312
|
+
const prompt = stage.pendingPrompt;
|
|
313
|
+
if (!prompt || prompt.id !== promptId) return undefined;
|
|
314
|
+
if (prompt.kind !== "input" && prompt.kind !== "editor") return undefined;
|
|
315
|
+
return { prompt };
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
function rejectStagePrompt(runId: string, stage: StageSnapshot, reason: string): void {
|
|
289
319
|
const prompt = stage.pendingPrompt;
|
|
290
320
|
if (!prompt) return;
|
|
291
321
|
stage.pendingPrompt = undefined;
|
|
322
|
+
_stagePromptDrafts.delete(stagePromptDraftKey(runId, stage.id, prompt.id));
|
|
292
323
|
rejectPrompt(prompt.id, reason);
|
|
293
324
|
}
|
|
294
325
|
|
|
295
|
-
function rejectAllStagePrompts(run: RunSnapshot, reason: string): void {
|
|
326
|
+
function rejectAllStagePrompts(runId: string, run: RunSnapshot, reason: string): void {
|
|
296
327
|
for (const stage of run.stages) {
|
|
297
|
-
rejectStagePrompt(stage, reason);
|
|
328
|
+
rejectStagePrompt(runId, stage, reason);
|
|
298
329
|
}
|
|
299
330
|
}
|
|
300
331
|
|
|
@@ -427,7 +458,7 @@ export function createStore(): Store {
|
|
|
427
458
|
if (stage.workflowChild !== undefined) existing.workflowChild = structuredClone(stage.workflowChild);
|
|
428
459
|
delete existing.awaitingInputSince;
|
|
429
460
|
delete existing.inputRequest;
|
|
430
|
-
rejectStagePrompt(existing, `atomic-workflows: stage ${stage.id} ended before prompt resolved`);
|
|
461
|
+
rejectStagePrompt(runId, existing, `atomic-workflows: stage ${stage.id} ended before prompt resolved`);
|
|
431
462
|
_version++;
|
|
432
463
|
notify();
|
|
433
464
|
},
|
|
@@ -474,7 +505,7 @@ export function createStore(): Store {
|
|
|
474
505
|
run.pendingPrompt = undefined;
|
|
475
506
|
rejectPrompt(pending.id, `atomic-workflows: run ${runId} ended before prompt resolved`);
|
|
476
507
|
}
|
|
477
|
-
rejectAllStagePrompts(run, `atomic-workflows: run ${runId} ended before prompt resolved`);
|
|
508
|
+
rejectAllStagePrompts(runId, run, `atomic-workflows: run ${runId} ended before prompt resolved`);
|
|
478
509
|
_version++;
|
|
479
510
|
notify();
|
|
480
511
|
return true;
|
|
@@ -488,7 +519,7 @@ export function createStore(): Store {
|
|
|
488
519
|
if (pending) {
|
|
489
520
|
rejectPrompt(pending.id, `atomic-workflows: run ${runId} was removed before prompt resolved`);
|
|
490
521
|
}
|
|
491
|
-
rejectAllStagePrompts(run, `atomic-workflows: run ${runId} was removed before prompt resolved`);
|
|
522
|
+
rejectAllStagePrompts(runId, run, `atomic-workflows: run ${runId} was removed before prompt resolved`);
|
|
492
523
|
for (const stage of run.stages) {
|
|
493
524
|
_stagePromptAnswers.delete(stagePromptAnswerKey(runId, stage.id));
|
|
494
525
|
}
|
|
@@ -599,6 +630,7 @@ export function createStore(): Store {
|
|
|
599
630
|
if (!stage) return false;
|
|
600
631
|
const pending = stage.pendingPrompt;
|
|
601
632
|
if (!pending || pending.id !== promptId) return false;
|
|
633
|
+
_stagePromptDrafts.delete(stagePromptDraftKey(runId, stageId, promptId));
|
|
602
634
|
if (options.recordAnswer !== false) {
|
|
603
635
|
_stagePromptAnswers.set(stagePromptAnswerKey(runId, stageId), {
|
|
604
636
|
runId,
|
|
@@ -654,6 +686,21 @@ export function createStore(): Store {
|
|
|
654
686
|
});
|
|
655
687
|
},
|
|
656
688
|
|
|
689
|
+
recordStagePromptDraft(runId: string, stageId: string, promptId: string, text: string): boolean {
|
|
690
|
+
if (stageHasActiveTextPrompt(runId, stageId, promptId) === undefined) return false;
|
|
691
|
+
_stagePromptDrafts.set(stagePromptDraftKey(runId, stageId, promptId), text);
|
|
692
|
+
return true;
|
|
693
|
+
},
|
|
694
|
+
|
|
695
|
+
getStagePromptDraft(runId: string, stageId: string, promptId: string): string | undefined {
|
|
696
|
+
if (stageHasActiveTextPrompt(runId, stageId, promptId) === undefined) return undefined;
|
|
697
|
+
return _stagePromptDrafts.get(stagePromptDraftKey(runId, stageId, promptId));
|
|
698
|
+
},
|
|
699
|
+
|
|
700
|
+
clearStagePromptDraft(runId: string, stageId: string, promptId: string): boolean {
|
|
701
|
+
return _stagePromptDrafts.delete(stagePromptDraftKey(runId, stageId, promptId));
|
|
702
|
+
},
|
|
703
|
+
|
|
657
704
|
getStagePromptAnswer(runId: string, stageId: string): PromptAnswerRecord | undefined {
|
|
658
705
|
return _stagePromptAnswers.get(stagePromptAnswerKey(runId, stageId));
|
|
659
706
|
},
|
|
@@ -896,7 +943,13 @@ export function createStore(): Store {
|
|
|
896
943
|
},
|
|
897
944
|
|
|
898
945
|
clear(): void {
|
|
899
|
-
if (
|
|
946
|
+
if (
|
|
947
|
+
_runs.length === 0 &&
|
|
948
|
+
_notices.length === 0 &&
|
|
949
|
+
_resolvers.size === 0 &&
|
|
950
|
+
_stagePromptAnswers.size === 0 &&
|
|
951
|
+
_stagePromptDrafts.size === 0
|
|
952
|
+
) return;
|
|
900
953
|
_runs.length = 0;
|
|
901
954
|
_notices.length = 0;
|
|
902
955
|
// Reject any outstanding HIL waiters so background promises terminate
|
|
@@ -907,6 +960,7 @@ export function createStore(): Store {
|
|
|
907
960
|
}
|
|
908
961
|
_resolvers.clear();
|
|
909
962
|
_stagePromptAnswers.clear();
|
|
963
|
+
_stagePromptDrafts.clear();
|
|
910
964
|
_version++;
|
|
911
965
|
notify();
|
|
912
966
|
},
|
|
@@ -79,7 +79,7 @@ interface CardComponent {
|
|
|
79
79
|
invalidate?(): void;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
type RawRenderer = (payload: unknown) =>
|
|
82
|
+
type RawRenderer = (payload: unknown) => CardComponent | null | undefined;
|
|
83
83
|
|
|
84
84
|
/**
|
|
85
85
|
* Wire the message renderer once per live ExtensionAPI host. pi creates a new
|
|
@@ -106,8 +106,11 @@ export function registerInlineFormRenderer(pi: ExtensionAPI, theme: GraphTheme):
|
|
|
106
106
|
if (!formId) return undefined;
|
|
107
107
|
const state = getForm(formId);
|
|
108
108
|
if (!state) {
|
|
109
|
-
//
|
|
110
|
-
|
|
109
|
+
// No backing state — the session was resumed/replaced (the store is
|
|
110
|
+
// cleared on session_start) or the map was evicted. Return null so the
|
|
111
|
+
// host renders nothing: the input widget must not reappear in chat after
|
|
112
|
+
// /resume rather than showing a stale or "snapshot lost" placeholder.
|
|
113
|
+
return null;
|
|
111
114
|
}
|
|
112
115
|
return {
|
|
113
116
|
// The card is fully reactive: read fresh state on every render call,
|
|
@@ -291,11 +294,17 @@ export async function openInlineInputsForm(
|
|
|
291
294
|
display?: boolean;
|
|
292
295
|
details?: FormMessageDetails;
|
|
293
296
|
},
|
|
297
|
+
options?: { excludeFromContext?: boolean },
|
|
294
298
|
) => void).call(pi, {
|
|
295
299
|
customType: CUSTOM_TYPE,
|
|
296
300
|
content: opts.workflowName,
|
|
297
301
|
display: true,
|
|
298
302
|
details: { formId },
|
|
303
|
+
}, {
|
|
304
|
+
// The input form is a transient UI surface, not conversation. Keep it
|
|
305
|
+
// out of LLM context so spawning the picker and exiting without
|
|
306
|
+
// running the workflow never leaks the form into the model.
|
|
307
|
+
excludeFromContext: true,
|
|
299
308
|
});
|
|
300
309
|
} catch {
|
|
301
310
|
activeEditor?.dispose?.();
|
|
@@ -12,11 +12,12 @@
|
|
|
12
12
|
* `finalizeForm(id, "submit")` → status = "submitted", values frozen
|
|
13
13
|
* `finalizeForm(id, "cancel")` → status = "cancelled"
|
|
14
14
|
*
|
|
15
|
-
* After finalize the state stays in the map
|
|
16
|
-
* renderer reads it to display the historical card.
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
15
|
+
* After finalize the state stays in the map for the lifetime of the session.
|
|
16
|
+
* The renderer reads it to display the historical card. On a session boundary
|
|
17
|
+
* (`session_start`: new/resume/fork/reload) the store is cleared via
|
|
18
|
+
* {@link clearForms}, so a rehydrated `workflows:input-form` message has no
|
|
19
|
+
* backing state and its renderer suppresses output (returns null) — the input
|
|
20
|
+
* widget never reappears in chat after `/resume`.
|
|
20
21
|
*
|
|
21
22
|
* Why a global registry instead of closure capture: the message renderer is
|
|
22
23
|
* registered ONCE at factory time and called many times for any number of
|
|
@@ -73,7 +74,17 @@ export function finalizeForm(formId: string, outcome: "submit" | "cancel"): void
|
|
|
73
74
|
touch(s);
|
|
74
75
|
}
|
|
75
76
|
|
|
77
|
+
/**
|
|
78
|
+
* Clear all inline form state. Called on `session_start` so a resumed or
|
|
79
|
+
* replaced session never renders a stale live form, and so a rehydrated
|
|
80
|
+
* `workflows:input-form` message resolves to no backing state (its renderer
|
|
81
|
+
* then returns null and the host renders nothing).
|
|
82
|
+
*/
|
|
83
|
+
export function clearForms(): void {
|
|
84
|
+
FORMS.clear();
|
|
85
|
+
}
|
|
86
|
+
|
|
76
87
|
/** Test helper — clear the registry between tests. */
|
|
77
88
|
export function _resetForms(): void {
|
|
78
|
-
|
|
89
|
+
clearForms();
|
|
79
90
|
}
|
|
@@ -521,6 +521,7 @@ export class StageChatView implements Component, Focusable {
|
|
|
521
521
|
}
|
|
522
522
|
if (!this.promptState || this.promptState.prompt.id !== prompt.id) {
|
|
523
523
|
this.promptState = createPromptCardState(prompt);
|
|
524
|
+
this._seedPromptTextState(prompt);
|
|
524
525
|
this._resetPromptEditor(prompt);
|
|
525
526
|
this._resetPromptScroll();
|
|
526
527
|
return true;
|
|
@@ -533,19 +534,49 @@ export class StageChatView implements Component, Focusable {
|
|
|
533
534
|
this.promptMaxScroll = 0;
|
|
534
535
|
}
|
|
535
536
|
|
|
537
|
+
private _promptSeedText(prompt: PendingPrompt): string {
|
|
538
|
+
const draft = this.store.getStagePromptDraft(this.runId, this.stageId, prompt.id);
|
|
539
|
+
if (draft !== undefined) return draft;
|
|
540
|
+
return typeof prompt.initial === "string" ? prompt.initial : "";
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
private _seedPromptTextState(prompt: PendingPrompt): void {
|
|
544
|
+
if (prompt.kind !== "input" && prompt.kind !== "editor") return;
|
|
545
|
+
if (!this.promptState || this.promptState.prompt.id !== prompt.id) return;
|
|
546
|
+
const seed = this._promptSeedText(prompt);
|
|
547
|
+
this.promptState.rawText = seed;
|
|
548
|
+
this.promptState.caret = seed.length;
|
|
549
|
+
}
|
|
550
|
+
|
|
551
|
+
private _recordPromptDraft(promptId: string, text: string): void {
|
|
552
|
+
this.store.recordStagePromptDraft(this.runId, this.stageId, promptId, text);
|
|
553
|
+
}
|
|
554
|
+
|
|
555
|
+
private _recordCurrentPromptDraft(): void {
|
|
556
|
+
const state = this.promptState;
|
|
557
|
+
if (!state) return;
|
|
558
|
+
const prompt = state.prompt;
|
|
559
|
+
if (prompt.kind !== "input" && prompt.kind !== "editor") return;
|
|
560
|
+
const text = this.promptEditor && this.promptEditorPromptId === prompt.id
|
|
561
|
+
? this.promptEditor.getText()
|
|
562
|
+
: state.rawText;
|
|
563
|
+
this._recordPromptDraft(prompt.id, text);
|
|
564
|
+
}
|
|
565
|
+
|
|
536
566
|
private _resetPromptEditor(prompt: PendingPrompt): void {
|
|
537
567
|
this._disposePromptEditor();
|
|
538
568
|
if ((prompt.kind !== "input" && prompt.kind !== "editor") || !this.piTui) return;
|
|
539
569
|
const editor = this.piEditorFactory
|
|
540
570
|
? this.piEditorFactory(this.piTui, editorThemeFromGraphTheme(this.theme), this.piKeybindings)
|
|
541
571
|
: new Editor(this.piTui, editorThemeFromGraphTheme(this.theme), { paddingX: 0 });
|
|
542
|
-
editor.setText(
|
|
572
|
+
editor.setText(this.promptState?.prompt.id === prompt.id ? this.promptState.rawText : this._promptSeedText(prompt));
|
|
543
573
|
setEditorPlaceholder(editor, "Type your response…");
|
|
544
574
|
setEditorBorderColor(editor, (text) => hexToAnsi(this.theme.accent) + text + RESET);
|
|
545
575
|
editor.onChange = (text: string) => {
|
|
546
576
|
if (this.promptState?.prompt.id !== prompt.id) return;
|
|
547
577
|
this.promptState.rawText = text;
|
|
548
578
|
this.promptState.caret = text.length;
|
|
579
|
+
this._recordPromptDraft(prompt.id, text);
|
|
549
580
|
this.requestRender?.();
|
|
550
581
|
};
|
|
551
582
|
editor.onSubmit = (text: string) => {
|
|
@@ -1248,11 +1279,14 @@ export class StageChatView implements Component, Focusable {
|
|
|
1248
1279
|
return;
|
|
1249
1280
|
}
|
|
1250
1281
|
const action = handlePromptCardInput(data, state, this._promptKeybindings());
|
|
1282
|
+
const prompt = state.prompt;
|
|
1283
|
+
if (prompt.kind === "input" || prompt.kind === "editor") {
|
|
1284
|
+
this._recordPromptDraft(prompt.id, state.rawText);
|
|
1285
|
+
}
|
|
1251
1286
|
if (action.kind === "noop") {
|
|
1252
1287
|
this.requestRender?.();
|
|
1253
1288
|
return;
|
|
1254
1289
|
}
|
|
1255
|
-
const prompt = state.prompt;
|
|
1256
1290
|
const response = action.kind === "submit"
|
|
1257
1291
|
? action.response
|
|
1258
1292
|
: defaultResponseFor(prompt);
|
|
@@ -1306,6 +1340,7 @@ export class StageChatView implements Component, Focusable {
|
|
|
1306
1340
|
const readOnlyPromptArchive = readOnlyArchive && stage?.promptFootprint !== undefined;
|
|
1307
1341
|
if (matchesKey(data, Key.ctrl("d"))) {
|
|
1308
1342
|
if (!this.promptState && this.chatHost.hasInputText()) return this.chatHost.handleInput(data);
|
|
1343
|
+
this._recordCurrentPromptDraft();
|
|
1309
1344
|
this.onDetach();
|
|
1310
1345
|
return true;
|
|
1311
1346
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-services.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-services.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAyB,KAAK,4BAA4B,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrH,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,wBAAwB,EAAsB,MAAM,UAAU,CAAC;AAC7G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD;;;;;;GAMG;AACH,MAAM,WAAW,6BAA6B;IAC7C,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iCAAiC;IACjD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IACpD,qBAAqB,CAAC,EAAE,IAAI,CAAC,4BAA4B,EAAE,KAAK,GAAG,UAAU,GAAG,iBAAiB,CAAC,CAAC;CACnG;AAED;;;;;GAKG;AACH,MAAM,WAAW,qCAAqC;IACrD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,yBAAyB,CAAC,eAAe,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,6BAA6B,EAAE,CAAC;CAC7C;AAkDD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC/C,OAAO,EAAE,iCAAiC,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAuC/B;AAED;;;;;;GAMG;AACH,wBAAsB,8BAA8B,CACnD,OAAO,EAAE,qCAAqC,GAC5C,OAAO,CAAC,wBAAwB,CAAC,CAkBnC","sourcesContent":["import { join } from \"node:path\";\nimport type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai\";\nimport { getAgentDir } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\nimport { AuthStorage } from \"./auth-storage.ts\";\nimport type { SessionStartEvent, ToolDefinition } from \"./extensions/index.ts\";\nimport { ModelRegistry } from \"./model-registry.ts\";\nimport { DefaultResourceLoader, type DefaultResourceLoaderOptions, type ResourceLoader } from \"./resource-loader.ts\";\nimport { type CreateAgentSessionOptions, type CreateAgentSessionResult, createAgentSession } from \"./sdk.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport { SettingsManager } from \"./settings-manager.ts\";\n\n/**\n * Non-fatal issues collected while creating services or sessions.\n *\n * Runtime creation returns diagnostics to the caller instead of printing or\n * exiting. The app layer decides whether warnings should be shown and whether\n * errors should abort startup.\n */\nexport interface AgentSessionRuntimeDiagnostic {\n\ttype: \"info\" | \"warning\" | \"error\";\n\tmessage: string;\n}\n\n/**\n * Inputs for creating cwd-bound runtime services.\n *\n * These services are recreated whenever the effective session cwd changes.\n * CLI-provided resource paths should be resolved to absolute paths before they\n * reach this function, so later cwd switches do not reinterpret them.\n */\nexport interface CreateAgentSessionServicesOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tauthStorage?: AuthStorage;\n\tsettingsManager?: SettingsManager;\n\tmodelRegistry?: ModelRegistry;\n\textensionFlagValues?: Map<string, boolean | string>;\n\tresourceLoaderOptions?: Omit<DefaultResourceLoaderOptions, \"cwd\" | \"agentDir\" | \"settingsManager\">;\n}\n\n/**\n * Inputs for creating an AgentSession from already-created services.\n *\n * Use this after services exist and any cwd-bound model/tool/session options\n * have been resolved against those services.\n */\nexport interface CreateAgentSessionFromServicesOptions {\n\tservices: AgentSessionServices;\n\tsessionManager: SessionManager;\n\tsessionStartEvent?: SessionStartEvent;\n\tmodel?: Model<Api>;\n\tthinkingLevel?: ThinkingLevel;\n\tscopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\ttools?: CreateAgentSessionOptions[\"tools\"];\n\texcludedTools?: CreateAgentSessionOptions[\"excludedTools\"];\n\tnoTools?: CreateAgentSessionOptions[\"noTools\"];\n\tcustomTools?: ToolDefinition[];\n}\n\n/**\n * Coherent cwd-bound runtime services for one effective session cwd.\n *\n * This is infrastructure only. The AgentSession itself is created separately so\n * session options can be resolved against these services first.\n */\nexport interface AgentSessionServices {\n\tcwd: string;\n\tagentDir: string;\n\tauthStorage: AuthStorage;\n\tsettingsManager: SettingsManager;\n\tmodelRegistry: ModelRegistry;\n\tresourceLoader: ResourceLoader;\n\tdiagnostics: AgentSessionRuntimeDiagnostic[];\n}\n\nfunction applyExtensionFlagValues(\n\tresourceLoader: ResourceLoader,\n\textensionFlagValues: Map<string, boolean | string> | undefined,\n): AgentSessionRuntimeDiagnostic[] {\n\tif (!extensionFlagValues) {\n\t\treturn [];\n\t}\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tconst registeredFlags = new Map<string, { type: \"boolean\" | \"string\" }>();\n\tfor (const extension of extensionsResult.extensions) {\n\t\tfor (const [name, flag] of extension.flags) {\n\t\t\tregisteredFlags.set(name, { type: flag.type });\n\t\t}\n\t}\n\n\tconst unknownFlags: string[] = [];\n\tfor (const [name, value] of extensionFlagValues) {\n\t\tconst flag = registeredFlags.get(name);\n\t\tif (!flag) {\n\t\t\tunknownFlags.push(name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (flag.type === \"boolean\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, true);\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof value === \"string\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, value);\n\t\t\tcontinue;\n\t\t}\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Extension flag \"--${name}\" requires a value`,\n\t\t});\n\t}\n\n\tif (unknownFlags.length > 0) {\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Unknown option${unknownFlags.length === 1 ? \"\" : \"s\"}: ${unknownFlags.map((name) => `--${name}`).join(\", \")}`,\n\t\t});\n\t}\n\n\treturn diagnostics;\n}\n\n/**\n * Create cwd-bound runtime services.\n *\n * Returns services plus diagnostics. It does not create an AgentSession.\n */\nexport async function createAgentSessionServices(\n\toptions: CreateAgentSessionServicesOptions,\n): Promise<AgentSessionServices> {\n\tconst cwd = resolvePath(options.cwd);\n\tconst agentDir = options.agentDir ? resolvePath(options.agentDir) : getAgentDir();\n\tconst authStorage = options.authStorage ?? AuthStorage.create(join(agentDir, \"auth.json\"));\n\tconst settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);\n\tconst modelRegistry = options.modelRegistry ?? ModelRegistry.create(authStorage, join(agentDir, \"models.json\"));\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\t...(options.resourceLoaderOptions ?? {}),\n\t\tcwd,\n\t\tagentDir,\n\t\tsettingsManager,\n\t});\n\tawait resourceLoader.reload();\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tfor (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {\n\t\ttry {\n\t\t\tmodelRegistry.registerProvider(name, config);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"error\",\n\t\t\t\tmessage: `Extension \"${extensionPath}\" error: ${message}`,\n\t\t\t});\n\t\t}\n\t}\n\textensionsResult.runtime.pendingProviderRegistrations = [];\n\tdiagnostics.push(...applyExtensionFlagValues(resourceLoader, options.extensionFlagValues));\n\n\treturn {\n\t\tcwd,\n\t\tagentDir,\n\t\tauthStorage,\n\t\tsettingsManager,\n\t\tmodelRegistry,\n\t\tresourceLoader,\n\t\tdiagnostics,\n\t};\n}\n\n/**\n * Create an AgentSession from previously created services.\n *\n * This keeps session creation separate from service creation so callers can\n * resolve model, thinking, tools, and other session inputs against the target\n * cwd before constructing the session.\n */\nexport async function createAgentSessionFromServices(\n\toptions: CreateAgentSessionFromServicesOptions,\n): Promise<CreateAgentSessionResult> {\n\treturn createAgentSession({\n\t\tcwd: options.services.cwd,\n\t\tagentDir: options.services.agentDir,\n\t\tauthStorage: options.services.authStorage,\n\t\tsettingsManager: options.services.settingsManager,\n\t\tmodelRegistry: options.services.modelRegistry,\n\t\tresourceLoader: options.services.resourceLoader,\n\t\tsessionManager: options.sessionManager,\n\t\tmodel: options.model,\n\t\tthinkingLevel: options.thinkingLevel,\n\t\tscopedModels: options.scopedModels,\n\t\ttools: options.tools,\n\t\texcludedTools: options.excludedTools,\n\t\tnoTools: options.noTools,\n\t\tcustomTools: options.customTools,\n\t\tsessionStartEvent: options.sessionStartEvent,\n\t});\n}\n"]}
|
|
1
|
+
{"version":3,"file":"agent-session-services.d.ts","sourceRoot":"","sources":["../../src/core/agent-session-services.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAyB,KAAK,4BAA4B,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrH,OAAO,EAAE,KAAK,yBAAyB,EAAE,KAAK,wBAAwB,EAAsB,MAAM,UAAU,CAAC;AAC7G,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD;;;;;;GAMG;AACH,MAAM,WAAW,6BAA6B;IAC7C,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iCAAiC;IACjD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;IACpD,qBAAqB,CAAC,EAAE,IAAI,CAAC,4BAA4B,EAAE,KAAK,GAAG,UAAU,GAAG,iBAAiB,CAAC,CAAC;CACnG;AAED;;;;;GAKG;AACH,MAAM,WAAW,qCAAqC;IACrD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,KAAK,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QAAC,aAAa,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;IAC3E,KAAK,CAAC,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,yBAAyB,CAAC,eAAe,CAAC,CAAC;IAC3D,OAAO,CAAC,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC/C,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,6BAA6B,EAAE,CAAC;CAC7C;AAkDD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC/C,OAAO,EAAE,iCAAiC,GACxC,OAAO,CAAC,oBAAoB,CAAC,CAmD/B;AAED;;;;;;GAMG;AACH,wBAAsB,8BAA8B,CACnD,OAAO,EAAE,qCAAqC,GAC5C,OAAO,CAAC,wBAAwB,CAAC,CAkBnC","sourcesContent":["import { join } from \"node:path\";\nimport type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai\";\nimport { getAgentDir } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\nimport { AuthStorage } from \"./auth-storage.ts\";\nimport type { SessionStartEvent, ToolDefinition } from \"./extensions/index.ts\";\nimport { ModelRegistry } from \"./model-registry.ts\";\nimport { DefaultResourceLoader, type DefaultResourceLoaderOptions, type ResourceLoader } from \"./resource-loader.ts\";\nimport { type CreateAgentSessionOptions, type CreateAgentSessionResult, createAgentSession } from \"./sdk.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport { SettingsManager } from \"./settings-manager.ts\";\nimport { endTimingSpan, startTimingSpan } from \"./timings.ts\";\n\n/**\n * Non-fatal issues collected while creating services or sessions.\n *\n * Runtime creation returns diagnostics to the caller instead of printing or\n * exiting. The app layer decides whether warnings should be shown and whether\n * errors should abort startup.\n */\nexport interface AgentSessionRuntimeDiagnostic {\n\ttype: \"info\" | \"warning\" | \"error\";\n\tmessage: string;\n}\n\n/**\n * Inputs for creating cwd-bound runtime services.\n *\n * These services are recreated whenever the effective session cwd changes.\n * CLI-provided resource paths should be resolved to absolute paths before they\n * reach this function, so later cwd switches do not reinterpret them.\n */\nexport interface CreateAgentSessionServicesOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tauthStorage?: AuthStorage;\n\tsettingsManager?: SettingsManager;\n\tmodelRegistry?: ModelRegistry;\n\textensionFlagValues?: Map<string, boolean | string>;\n\tresourceLoaderOptions?: Omit<DefaultResourceLoaderOptions, \"cwd\" | \"agentDir\" | \"settingsManager\">;\n}\n\n/**\n * Inputs for creating an AgentSession from already-created services.\n *\n * Use this after services exist and any cwd-bound model/tool/session options\n * have been resolved against those services.\n */\nexport interface CreateAgentSessionFromServicesOptions {\n\tservices: AgentSessionServices;\n\tsessionManager: SessionManager;\n\tsessionStartEvent?: SessionStartEvent;\n\tmodel?: Model<Api>;\n\tthinkingLevel?: ThinkingLevel;\n\tscopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\ttools?: CreateAgentSessionOptions[\"tools\"];\n\texcludedTools?: CreateAgentSessionOptions[\"excludedTools\"];\n\tnoTools?: CreateAgentSessionOptions[\"noTools\"];\n\tcustomTools?: ToolDefinition[];\n}\n\n/**\n * Coherent cwd-bound runtime services for one effective session cwd.\n *\n * This is infrastructure only. The AgentSession itself is created separately so\n * session options can be resolved against these services first.\n */\nexport interface AgentSessionServices {\n\tcwd: string;\n\tagentDir: string;\n\tauthStorage: AuthStorage;\n\tsettingsManager: SettingsManager;\n\tmodelRegistry: ModelRegistry;\n\tresourceLoader: ResourceLoader;\n\tdiagnostics: AgentSessionRuntimeDiagnostic[];\n}\n\nfunction applyExtensionFlagValues(\n\tresourceLoader: ResourceLoader,\n\textensionFlagValues: Map<string, boolean | string> | undefined,\n): AgentSessionRuntimeDiagnostic[] {\n\tif (!extensionFlagValues) {\n\t\treturn [];\n\t}\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tconst registeredFlags = new Map<string, { type: \"boolean\" | \"string\" }>();\n\tfor (const extension of extensionsResult.extensions) {\n\t\tfor (const [name, flag] of extension.flags) {\n\t\t\tregisteredFlags.set(name, { type: flag.type });\n\t\t}\n\t}\n\n\tconst unknownFlags: string[] = [];\n\tfor (const [name, value] of extensionFlagValues) {\n\t\tconst flag = registeredFlags.get(name);\n\t\tif (!flag) {\n\t\t\tunknownFlags.push(name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (flag.type === \"boolean\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, true);\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof value === \"string\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, value);\n\t\t\tcontinue;\n\t\t}\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Extension flag \"--${name}\" requires a value`,\n\t\t});\n\t}\n\n\tif (unknownFlags.length > 0) {\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Unknown option${unknownFlags.length === 1 ? \"\" : \"s\"}: ${unknownFlags.map((name) => `--${name}`).join(\", \")}`,\n\t\t});\n\t}\n\n\treturn diagnostics;\n}\n\n/**\n * Create cwd-bound runtime services.\n *\n * Returns services plus diagnostics. It does not create an AgentSession.\n */\nexport async function createAgentSessionServices(\n\toptions: CreateAgentSessionServicesOptions,\n): Promise<AgentSessionServices> {\n\tconst cwd = resolvePath(options.cwd);\n\tconst agentDir = options.agentDir ? resolvePath(options.agentDir) : getAgentDir();\n\tconst authStorageSpan = startTimingSpan(\"createAgentSessionServices.authStorage\");\n\tconst authStorage = options.authStorage ?? AuthStorage.create(join(agentDir, \"auth.json\"));\n\tendTimingSpan(authStorageSpan);\n\tconst settingsSpan = startTimingSpan(\"createAgentSessionServices.settingsManager\");\n\tconst settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);\n\tendTimingSpan(settingsSpan);\n\tconst modelRegistrySpan = startTimingSpan(\"createAgentSessionServices.modelRegistry\");\n\tconst modelRegistry = options.modelRegistry ?? ModelRegistry.create(authStorage, join(agentDir, \"models.json\"));\n\tendTimingSpan(modelRegistrySpan);\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\t...(options.resourceLoaderOptions ?? {}),\n\t\tcwd,\n\t\tagentDir,\n\t\tsettingsManager,\n\t});\n\tconst reloadSpan = startTimingSpan(\"createAgentSessionServices.resourceLoader.reload\");\n\tawait resourceLoader.reload();\n\tendTimingSpan(reloadSpan);\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst providerSpan = startTimingSpan(\"createAgentSessionServices.providerRegistrations\");\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tfor (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {\n\t\ttry {\n\t\t\tmodelRegistry.registerProvider(name, config);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"error\",\n\t\t\t\tmessage: `Extension \"${extensionPath}\" error: ${message}`,\n\t\t\t});\n\t\t}\n\t}\n\textensionsResult.runtime.pendingProviderRegistrations = [];\n\tendTimingSpan(providerSpan);\n\tconst flagSpan = startTimingSpan(\"createAgentSessionServices.extensionFlagValidation\");\n\tdiagnostics.push(...applyExtensionFlagValues(resourceLoader, options.extensionFlagValues));\n\tendTimingSpan(flagSpan);\n\n\treturn {\n\t\tcwd,\n\t\tagentDir,\n\t\tauthStorage,\n\t\tsettingsManager,\n\t\tmodelRegistry,\n\t\tresourceLoader,\n\t\tdiagnostics,\n\t};\n}\n\n/**\n * Create an AgentSession from previously created services.\n *\n * This keeps session creation separate from service creation so callers can\n * resolve model, thinking, tools, and other session inputs against the target\n * cwd before constructing the session.\n */\nexport async function createAgentSessionFromServices(\n\toptions: CreateAgentSessionFromServicesOptions,\n): Promise<CreateAgentSessionResult> {\n\treturn createAgentSession({\n\t\tcwd: options.services.cwd,\n\t\tagentDir: options.services.agentDir,\n\t\tauthStorage: options.services.authStorage,\n\t\tsettingsManager: options.services.settingsManager,\n\t\tmodelRegistry: options.services.modelRegistry,\n\t\tresourceLoader: options.services.resourceLoader,\n\t\tsessionManager: options.sessionManager,\n\t\tmodel: options.model,\n\t\tthinkingLevel: options.thinkingLevel,\n\t\tscopedModels: options.scopedModels,\n\t\ttools: options.tools,\n\t\texcludedTools: options.excludedTools,\n\t\tnoTools: options.noTools,\n\t\tcustomTools: options.customTools,\n\t\tsessionStartEvent: options.sessionStartEvent,\n\t});\n}\n"]}
|
|
@@ -6,6 +6,7 @@ import { ModelRegistry } from "./model-registry.js";
|
|
|
6
6
|
import { DefaultResourceLoader } from "./resource-loader.js";
|
|
7
7
|
import { createAgentSession } from "./sdk.js";
|
|
8
8
|
import { SettingsManager } from "./settings-manager.js";
|
|
9
|
+
import { endTimingSpan, startTimingSpan } from "./timings.js";
|
|
9
10
|
function applyExtensionFlagValues(resourceLoader, extensionFlagValues) {
|
|
10
11
|
if (!extensionFlagValues) {
|
|
11
12
|
return [];
|
|
@@ -54,17 +55,26 @@ function applyExtensionFlagValues(resourceLoader, extensionFlagValues) {
|
|
|
54
55
|
export async function createAgentSessionServices(options) {
|
|
55
56
|
const cwd = resolvePath(options.cwd);
|
|
56
57
|
const agentDir = options.agentDir ? resolvePath(options.agentDir) : getAgentDir();
|
|
58
|
+
const authStorageSpan = startTimingSpan("createAgentSessionServices.authStorage");
|
|
57
59
|
const authStorage = options.authStorage ?? AuthStorage.create(join(agentDir, "auth.json"));
|
|
60
|
+
endTimingSpan(authStorageSpan);
|
|
61
|
+
const settingsSpan = startTimingSpan("createAgentSessionServices.settingsManager");
|
|
58
62
|
const settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);
|
|
63
|
+
endTimingSpan(settingsSpan);
|
|
64
|
+
const modelRegistrySpan = startTimingSpan("createAgentSessionServices.modelRegistry");
|
|
59
65
|
const modelRegistry = options.modelRegistry ?? ModelRegistry.create(authStorage, join(agentDir, "models.json"));
|
|
66
|
+
endTimingSpan(modelRegistrySpan);
|
|
60
67
|
const resourceLoader = new DefaultResourceLoader({
|
|
61
68
|
...(options.resourceLoaderOptions ?? {}),
|
|
62
69
|
cwd,
|
|
63
70
|
agentDir,
|
|
64
71
|
settingsManager,
|
|
65
72
|
});
|
|
73
|
+
const reloadSpan = startTimingSpan("createAgentSessionServices.resourceLoader.reload");
|
|
66
74
|
await resourceLoader.reload();
|
|
75
|
+
endTimingSpan(reloadSpan);
|
|
67
76
|
const diagnostics = [];
|
|
77
|
+
const providerSpan = startTimingSpan("createAgentSessionServices.providerRegistrations");
|
|
68
78
|
const extensionsResult = resourceLoader.getExtensions();
|
|
69
79
|
for (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {
|
|
70
80
|
try {
|
|
@@ -79,7 +89,10 @@ export async function createAgentSessionServices(options) {
|
|
|
79
89
|
}
|
|
80
90
|
}
|
|
81
91
|
extensionsResult.runtime.pendingProviderRegistrations = [];
|
|
92
|
+
endTimingSpan(providerSpan);
|
|
93
|
+
const flagSpan = startTimingSpan("createAgentSessionServices.extensionFlagValidation");
|
|
82
94
|
diagnostics.push(...applyExtensionFlagValues(resourceLoader, options.extensionFlagValues));
|
|
95
|
+
endTimingSpan(flagSpan);
|
|
83
96
|
return {
|
|
84
97
|
cwd,
|
|
85
98
|
agentDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-session-services.js","sourceRoot":"","sources":["../../src/core/agent-session-services.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAA0D,MAAM,sBAAsB,CAAC;AACrH,OAAO,EAAiE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE7G,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAkExD,SAAS,wBAAwB,CAChC,cAA8B,EAC9B,mBAA8D;IAE9D,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,WAAW,GAAoC,EAAE,CAAC;IACxD,MAAM,gBAAgB,GAAG,cAAc,CAAC,aAAa,EAAE,CAAC;IACxD,MAAM,eAAe,GAAG,IAAI,GAAG,EAA0C,CAAC;IAC1E,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,UAAU,EAAE,CAAC;QACrD,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;YAC5C,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IAED,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC;QACjD,MAAM,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,SAAS;QACV,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpD,SAAS;QACV,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrD,SAAS;QACV,CAAC;QACD,WAAW,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,qBAAqB,IAAI,oBAAoB;SACtD,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,WAAW,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,iBAAiB,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SACvH,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC/C,OAA0C;IAE1C,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAClF,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAC3F,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC;IAChH,MAAM,cAAc,GAAG,IAAI,qBAAqB,CAAC;QAChD,GAAG,CAAC,OAAO,CAAC,qBAAqB,IAAI,EAAE,CAAC;QACxC,GAAG;QACH,QAAQ;QACR,eAAe;KACf,CAAC,CAAC;IACH,MAAM,cAAc,CAAC,MAAM,EAAE,CAAC;IAE9B,MAAM,WAAW,GAAoC,EAAE,CAAC;IACxD,MAAM,gBAAgB,GAAG,cAAc,CAAC,aAAa,EAAE,CAAC;IACxD,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,gBAAgB,CAAC,OAAO,CAAC,4BAA4B,EAAE,CAAC;QACrG,IAAI,CAAC;YACJ,aAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,WAAW,CAAC,IAAI,CAAC;gBAChB,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,cAAc,aAAa,YAAY,OAAO,EAAE;aACzD,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IACD,gBAAgB,CAAC,OAAO,CAAC,4BAA4B,GAAG,EAAE,CAAC;IAC3D,WAAW,CAAC,IAAI,CAAC,GAAG,wBAAwB,CAAC,cAAc,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAE3F,OAAO;QACN,GAAG;QACH,QAAQ;QACR,WAAW;QACX,eAAe;QACf,aAAa;QACb,cAAc;QACd,WAAW;KACX,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CACnD,OAA8C;IAE9C,OAAO,kBAAkB,CAAC;QACzB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG;QACzB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ;QACnC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW;QACzC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,eAAe;QACjD,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,aAAa;QAC7C,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,cAAc;QAC/C,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC5C,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { join } from \"node:path\";\nimport type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai\";\nimport { getAgentDir } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\nimport { AuthStorage } from \"./auth-storage.ts\";\nimport type { SessionStartEvent, ToolDefinition } from \"./extensions/index.ts\";\nimport { ModelRegistry } from \"./model-registry.ts\";\nimport { DefaultResourceLoader, type DefaultResourceLoaderOptions, type ResourceLoader } from \"./resource-loader.ts\";\nimport { type CreateAgentSessionOptions, type CreateAgentSessionResult, createAgentSession } from \"./sdk.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport { SettingsManager } from \"./settings-manager.ts\";\n\n/**\n * Non-fatal issues collected while creating services or sessions.\n *\n * Runtime creation returns diagnostics to the caller instead of printing or\n * exiting. The app layer decides whether warnings should be shown and whether\n * errors should abort startup.\n */\nexport interface AgentSessionRuntimeDiagnostic {\n\ttype: \"info\" | \"warning\" | \"error\";\n\tmessage: string;\n}\n\n/**\n * Inputs for creating cwd-bound runtime services.\n *\n * These services are recreated whenever the effective session cwd changes.\n * CLI-provided resource paths should be resolved to absolute paths before they\n * reach this function, so later cwd switches do not reinterpret them.\n */\nexport interface CreateAgentSessionServicesOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tauthStorage?: AuthStorage;\n\tsettingsManager?: SettingsManager;\n\tmodelRegistry?: ModelRegistry;\n\textensionFlagValues?: Map<string, boolean | string>;\n\tresourceLoaderOptions?: Omit<DefaultResourceLoaderOptions, \"cwd\" | \"agentDir\" | \"settingsManager\">;\n}\n\n/**\n * Inputs for creating an AgentSession from already-created services.\n *\n * Use this after services exist and any cwd-bound model/tool/session options\n * have been resolved against those services.\n */\nexport interface CreateAgentSessionFromServicesOptions {\n\tservices: AgentSessionServices;\n\tsessionManager: SessionManager;\n\tsessionStartEvent?: SessionStartEvent;\n\tmodel?: Model<Api>;\n\tthinkingLevel?: ThinkingLevel;\n\tscopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\ttools?: CreateAgentSessionOptions[\"tools\"];\n\texcludedTools?: CreateAgentSessionOptions[\"excludedTools\"];\n\tnoTools?: CreateAgentSessionOptions[\"noTools\"];\n\tcustomTools?: ToolDefinition[];\n}\n\n/**\n * Coherent cwd-bound runtime services for one effective session cwd.\n *\n * This is infrastructure only. The AgentSession itself is created separately so\n * session options can be resolved against these services first.\n */\nexport interface AgentSessionServices {\n\tcwd: string;\n\tagentDir: string;\n\tauthStorage: AuthStorage;\n\tsettingsManager: SettingsManager;\n\tmodelRegistry: ModelRegistry;\n\tresourceLoader: ResourceLoader;\n\tdiagnostics: AgentSessionRuntimeDiagnostic[];\n}\n\nfunction applyExtensionFlagValues(\n\tresourceLoader: ResourceLoader,\n\textensionFlagValues: Map<string, boolean | string> | undefined,\n): AgentSessionRuntimeDiagnostic[] {\n\tif (!extensionFlagValues) {\n\t\treturn [];\n\t}\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tconst registeredFlags = new Map<string, { type: \"boolean\" | \"string\" }>();\n\tfor (const extension of extensionsResult.extensions) {\n\t\tfor (const [name, flag] of extension.flags) {\n\t\t\tregisteredFlags.set(name, { type: flag.type });\n\t\t}\n\t}\n\n\tconst unknownFlags: string[] = [];\n\tfor (const [name, value] of extensionFlagValues) {\n\t\tconst flag = registeredFlags.get(name);\n\t\tif (!flag) {\n\t\t\tunknownFlags.push(name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (flag.type === \"boolean\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, true);\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof value === \"string\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, value);\n\t\t\tcontinue;\n\t\t}\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Extension flag \"--${name}\" requires a value`,\n\t\t});\n\t}\n\n\tif (unknownFlags.length > 0) {\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Unknown option${unknownFlags.length === 1 ? \"\" : \"s\"}: ${unknownFlags.map((name) => `--${name}`).join(\", \")}`,\n\t\t});\n\t}\n\n\treturn diagnostics;\n}\n\n/**\n * Create cwd-bound runtime services.\n *\n * Returns services plus diagnostics. It does not create an AgentSession.\n */\nexport async function createAgentSessionServices(\n\toptions: CreateAgentSessionServicesOptions,\n): Promise<AgentSessionServices> {\n\tconst cwd = resolvePath(options.cwd);\n\tconst agentDir = options.agentDir ? resolvePath(options.agentDir) : getAgentDir();\n\tconst authStorage = options.authStorage ?? AuthStorage.create(join(agentDir, \"auth.json\"));\n\tconst settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);\n\tconst modelRegistry = options.modelRegistry ?? ModelRegistry.create(authStorage, join(agentDir, \"models.json\"));\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\t...(options.resourceLoaderOptions ?? {}),\n\t\tcwd,\n\t\tagentDir,\n\t\tsettingsManager,\n\t});\n\tawait resourceLoader.reload();\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tfor (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {\n\t\ttry {\n\t\t\tmodelRegistry.registerProvider(name, config);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"error\",\n\t\t\t\tmessage: `Extension \"${extensionPath}\" error: ${message}`,\n\t\t\t});\n\t\t}\n\t}\n\textensionsResult.runtime.pendingProviderRegistrations = [];\n\tdiagnostics.push(...applyExtensionFlagValues(resourceLoader, options.extensionFlagValues));\n\n\treturn {\n\t\tcwd,\n\t\tagentDir,\n\t\tauthStorage,\n\t\tsettingsManager,\n\t\tmodelRegistry,\n\t\tresourceLoader,\n\t\tdiagnostics,\n\t};\n}\n\n/**\n * Create an AgentSession from previously created services.\n *\n * This keeps session creation separate from service creation so callers can\n * resolve model, thinking, tools, and other session inputs against the target\n * cwd before constructing the session.\n */\nexport async function createAgentSessionFromServices(\n\toptions: CreateAgentSessionFromServicesOptions,\n): Promise<CreateAgentSessionResult> {\n\treturn createAgentSession({\n\t\tcwd: options.services.cwd,\n\t\tagentDir: options.services.agentDir,\n\t\tauthStorage: options.services.authStorage,\n\t\tsettingsManager: options.services.settingsManager,\n\t\tmodelRegistry: options.services.modelRegistry,\n\t\tresourceLoader: options.services.resourceLoader,\n\t\tsessionManager: options.sessionManager,\n\t\tmodel: options.model,\n\t\tthinkingLevel: options.thinkingLevel,\n\t\tscopedModels: options.scopedModels,\n\t\ttools: options.tools,\n\t\texcludedTools: options.excludedTools,\n\t\tnoTools: options.noTools,\n\t\tcustomTools: options.customTools,\n\t\tsessionStartEvent: options.sessionStartEvent,\n\t});\n}\n"]}
|
|
1
|
+
{"version":3,"file":"agent-session-services.js","sourceRoot":"","sources":["../../src/core/agent-session-services.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from \"node:path\";\nimport type { ThinkingLevel } from \"@earendil-works/pi-agent-core\";\nimport type { Api, Model } from \"@earendil-works/pi-ai\";\nimport { getAgentDir } from \"../config.ts\";\nimport { resolvePath } from \"../utils/paths.ts\";\nimport { AuthStorage } from \"./auth-storage.ts\";\nimport type { SessionStartEvent, ToolDefinition } from \"./extensions/index.ts\";\nimport { ModelRegistry } from \"./model-registry.ts\";\nimport { DefaultResourceLoader, type DefaultResourceLoaderOptions, type ResourceLoader } from \"./resource-loader.ts\";\nimport { type CreateAgentSessionOptions, type CreateAgentSessionResult, createAgentSession } from \"./sdk.ts\";\nimport type { SessionManager } from \"./session-manager.ts\";\nimport { SettingsManager } from \"./settings-manager.ts\";\nimport { endTimingSpan, startTimingSpan } from \"./timings.ts\";\n\n/**\n * Non-fatal issues collected while creating services or sessions.\n *\n * Runtime creation returns diagnostics to the caller instead of printing or\n * exiting. The app layer decides whether warnings should be shown and whether\n * errors should abort startup.\n */\nexport interface AgentSessionRuntimeDiagnostic {\n\ttype: \"info\" | \"warning\" | \"error\";\n\tmessage: string;\n}\n\n/**\n * Inputs for creating cwd-bound runtime services.\n *\n * These services are recreated whenever the effective session cwd changes.\n * CLI-provided resource paths should be resolved to absolute paths before they\n * reach this function, so later cwd switches do not reinterpret them.\n */\nexport interface CreateAgentSessionServicesOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tauthStorage?: AuthStorage;\n\tsettingsManager?: SettingsManager;\n\tmodelRegistry?: ModelRegistry;\n\textensionFlagValues?: Map<string, boolean | string>;\n\tresourceLoaderOptions?: Omit<DefaultResourceLoaderOptions, \"cwd\" | \"agentDir\" | \"settingsManager\">;\n}\n\n/**\n * Inputs for creating an AgentSession from already-created services.\n *\n * Use this after services exist and any cwd-bound model/tool/session options\n * have been resolved against those services.\n */\nexport interface CreateAgentSessionFromServicesOptions {\n\tservices: AgentSessionServices;\n\tsessionManager: SessionManager;\n\tsessionStartEvent?: SessionStartEvent;\n\tmodel?: Model<Api>;\n\tthinkingLevel?: ThinkingLevel;\n\tscopedModels?: Array<{ model: Model<Api>; thinkingLevel?: ThinkingLevel }>;\n\ttools?: CreateAgentSessionOptions[\"tools\"];\n\texcludedTools?: CreateAgentSessionOptions[\"excludedTools\"];\n\tnoTools?: CreateAgentSessionOptions[\"noTools\"];\n\tcustomTools?: ToolDefinition[];\n}\n\n/**\n * Coherent cwd-bound runtime services for one effective session cwd.\n *\n * This is infrastructure only. The AgentSession itself is created separately so\n * session options can be resolved against these services first.\n */\nexport interface AgentSessionServices {\n\tcwd: string;\n\tagentDir: string;\n\tauthStorage: AuthStorage;\n\tsettingsManager: SettingsManager;\n\tmodelRegistry: ModelRegistry;\n\tresourceLoader: ResourceLoader;\n\tdiagnostics: AgentSessionRuntimeDiagnostic[];\n}\n\nfunction applyExtensionFlagValues(\n\tresourceLoader: ResourceLoader,\n\textensionFlagValues: Map<string, boolean | string> | undefined,\n): AgentSessionRuntimeDiagnostic[] {\n\tif (!extensionFlagValues) {\n\t\treturn [];\n\t}\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tconst registeredFlags = new Map<string, { type: \"boolean\" | \"string\" }>();\n\tfor (const extension of extensionsResult.extensions) {\n\t\tfor (const [name, flag] of extension.flags) {\n\t\t\tregisteredFlags.set(name, { type: flag.type });\n\t\t}\n\t}\n\n\tconst unknownFlags: string[] = [];\n\tfor (const [name, value] of extensionFlagValues) {\n\t\tconst flag = registeredFlags.get(name);\n\t\tif (!flag) {\n\t\t\tunknownFlags.push(name);\n\t\t\tcontinue;\n\t\t}\n\t\tif (flag.type === \"boolean\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, true);\n\t\t\tcontinue;\n\t\t}\n\t\tif (typeof value === \"string\") {\n\t\t\textensionsResult.runtime.flagValues.set(name, value);\n\t\t\tcontinue;\n\t\t}\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Extension flag \"--${name}\" requires a value`,\n\t\t});\n\t}\n\n\tif (unknownFlags.length > 0) {\n\t\tdiagnostics.push({\n\t\t\ttype: \"error\",\n\t\t\tmessage: `Unknown option${unknownFlags.length === 1 ? \"\" : \"s\"}: ${unknownFlags.map((name) => `--${name}`).join(\", \")}`,\n\t\t});\n\t}\n\n\treturn diagnostics;\n}\n\n/**\n * Create cwd-bound runtime services.\n *\n * Returns services plus diagnostics. It does not create an AgentSession.\n */\nexport async function createAgentSessionServices(\n\toptions: CreateAgentSessionServicesOptions,\n): Promise<AgentSessionServices> {\n\tconst cwd = resolvePath(options.cwd);\n\tconst agentDir = options.agentDir ? resolvePath(options.agentDir) : getAgentDir();\n\tconst authStorageSpan = startTimingSpan(\"createAgentSessionServices.authStorage\");\n\tconst authStorage = options.authStorage ?? AuthStorage.create(join(agentDir, \"auth.json\"));\n\tendTimingSpan(authStorageSpan);\n\tconst settingsSpan = startTimingSpan(\"createAgentSessionServices.settingsManager\");\n\tconst settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);\n\tendTimingSpan(settingsSpan);\n\tconst modelRegistrySpan = startTimingSpan(\"createAgentSessionServices.modelRegistry\");\n\tconst modelRegistry = options.modelRegistry ?? ModelRegistry.create(authStorage, join(agentDir, \"models.json\"));\n\tendTimingSpan(modelRegistrySpan);\n\tconst resourceLoader = new DefaultResourceLoader({\n\t\t...(options.resourceLoaderOptions ?? {}),\n\t\tcwd,\n\t\tagentDir,\n\t\tsettingsManager,\n\t});\n\tconst reloadSpan = startTimingSpan(\"createAgentSessionServices.resourceLoader.reload\");\n\tawait resourceLoader.reload();\n\tendTimingSpan(reloadSpan);\n\n\tconst diagnostics: AgentSessionRuntimeDiagnostic[] = [];\n\tconst providerSpan = startTimingSpan(\"createAgentSessionServices.providerRegistrations\");\n\tconst extensionsResult = resourceLoader.getExtensions();\n\tfor (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {\n\t\ttry {\n\t\t\tmodelRegistry.registerProvider(name, config);\n\t\t} catch (error) {\n\t\t\tconst message = error instanceof Error ? error.message : String(error);\n\t\t\tdiagnostics.push({\n\t\t\t\ttype: \"error\",\n\t\t\t\tmessage: `Extension \"${extensionPath}\" error: ${message}`,\n\t\t\t});\n\t\t}\n\t}\n\textensionsResult.runtime.pendingProviderRegistrations = [];\n\tendTimingSpan(providerSpan);\n\tconst flagSpan = startTimingSpan(\"createAgentSessionServices.extensionFlagValidation\");\n\tdiagnostics.push(...applyExtensionFlagValues(resourceLoader, options.extensionFlagValues));\n\tendTimingSpan(flagSpan);\n\n\treturn {\n\t\tcwd,\n\t\tagentDir,\n\t\tauthStorage,\n\t\tsettingsManager,\n\t\tmodelRegistry,\n\t\tresourceLoader,\n\t\tdiagnostics,\n\t};\n}\n\n/**\n * Create an AgentSession from previously created services.\n *\n * This keeps session creation separate from service creation so callers can\n * resolve model, thinking, tools, and other session inputs against the target\n * cwd before constructing the session.\n */\nexport async function createAgentSessionFromServices(\n\toptions: CreateAgentSessionFromServicesOptions,\n): Promise<CreateAgentSessionResult> {\n\treturn createAgentSession({\n\t\tcwd: options.services.cwd,\n\t\tagentDir: options.services.agentDir,\n\t\tauthStorage: options.services.authStorage,\n\t\tsettingsManager: options.services.settingsManager,\n\t\tmodelRegistry: options.services.modelRegistry,\n\t\tresourceLoader: options.services.resourceLoader,\n\t\tsessionManager: options.sessionManager,\n\t\tmodel: options.model,\n\t\tthinkingLevel: options.thinkingLevel,\n\t\tscopedModels: options.scopedModels,\n\t\ttools: options.tools,\n\t\texcludedTools: options.excludedTools,\n\t\tnoTools: options.noTools,\n\t\tcustomTools: options.customTools,\n\t\tsessionStartEvent: options.sessionStartEvent,\n\t});\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA6BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,KAAK,EACV,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAKrB,MAAM,YAAY,CAAC;AA8FpB,MAAM,WAAW,wBAAwB;IACvC,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAC1B,OAAO,CAAC,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG,gBAAgB,EAAE,CAAC;AAc1F;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAsDzD;AAiRD;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,EAC1B,wBAAwB,GAAE,6BAA6D,GACtF,OAAO,CAAC,SAAS,CAAC,CAYpB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,GACtF,OAAO,CAAC,oBAAoB,CAAC,CA+B/B;AAqID;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,oBAAoB,CAAC,CA4C/B","sourcesContent":["/**\n * Extension loader - loads TypeScript extension modules using jiti.\n *\n */\n\nimport * as fs from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport * as path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport * as _bundledPiAgentCore from \"@earendil-works/pi-agent-core\";\nimport * as _bundledPiAi from \"@earendil-works/pi-ai\";\nimport * as _bundledPiAiOauth from \"@earendil-works/pi-ai/oauth\";\nimport type { KeyId } from \"@earendil-works/pi-tui\";\nimport * as _bundledPiTui from \"@earendil-works/pi-tui\";\nimport { createJiti } from \"jiti/static\";\n// Static imports of packages that extensions may use.\n// These MUST be static so Bun bundles them into the compiled binary.\n// The virtualModules option then makes them available to extensions.\nimport * as _bundledTypebox from \"typebox\";\nimport * as _bundledTypeboxCompile from \"typebox/compile\";\nimport * as _bundledTypeboxValue from \"typebox/value\";\nimport {\n APP_NAME,\n CONFIG_DIR_NAME,\n getAgentDir,\n isBunBinary,\n} from \"../../config.ts\";\n// NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,\n// avoiding a circular dependency. Extensions can import from the Atomic package\n// name (or upstream-compatible pi package names).\nimport * as _bundledPiCodingAgent from \"../../index.ts\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport type { ExecOptions } from \"../exec.ts\";\nimport type { ResolvedResource } from \"../package-manager.ts\";\nimport { execCommand } from \"../exec.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport type {\n Extension,\n ExtensionAPI,\n ExtensionFactory,\n ExtensionRuntime,\n LoadExtensionsResult,\n MessageRenderer,\n ProviderConfig,\n RegisteredCommand,\n ToolDefinition,\n} from \"./types.ts\";\n\n/** Modules available to extensions via virtualModules (for compiled Bun binary) */\nconst VIRTUAL_MODULES: Record<string, unknown> = {\n typebox: _bundledTypebox,\n \"typebox/compile\": _bundledTypeboxCompile,\n \"typebox/value\": _bundledTypeboxValue,\n \"@sinclair/typebox\": _bundledTypebox,\n \"@sinclair/typebox/compile\": _bundledTypeboxCompile,\n \"@sinclair/typebox/value\": _bundledTypeboxValue,\n \"@earendil-works/pi-agent-core\": _bundledPiAgentCore,\n \"@earendil-works/pi-tui\": _bundledPiTui,\n \"@earendil-works/pi-ai\": _bundledPiAi,\n \"@earendil-works/pi-ai/oauth\": _bundledPiAiOauth,\n \"@bastani/atomic\": _bundledPiCodingAgent,\n \"@mariozechner/pi-agent-core\": _bundledPiAgentCore,\n \"@mariozechner/pi-tui\": _bundledPiTui,\n \"@mariozechner/pi-ai\": _bundledPiAi,\n \"@mariozechner/pi-ai/oauth\": _bundledPiAiOauth,\n};\n\nconst require = createRequire(import.meta.url);\n\n/**\n * Get aliases for jiti (used in Node.js/development mode).\n * In Bun binary mode, virtualModules is used instead.\n */\nlet _aliases: Record<string, string> | null = null;\n\nfunction getAliases(): Record<string, string> {\n if (_aliases) return _aliases;\n\n const __dirname = path.dirname(fileURLToPath(import.meta.url));\n const packageIndex = path.resolve(__dirname, \"../..\", \"index.js\");\n\n const typeboxEntry = require.resolve(\"typebox\");\n const typeboxCompileEntry = require.resolve(\"typebox/compile\");\n const typeboxValueEntry = require.resolve(\"typebox/value\");\n\n const packagesRoot = path.resolve(__dirname, \"../../../../\");\n const resolveWorkspaceOrImport = (\n workspaceRelativePath: string,\n specifier: string,\n ): string => {\n const workspacePath = path.join(packagesRoot, workspaceRelativePath);\n if (fs.existsSync(workspacePath)) {\n return workspacePath;\n }\n return fileURLToPath(import.meta.resolve(specifier));\n };\n\n const piCodingAgentEntry = packageIndex;\n const piAgentCoreEntry = resolveWorkspaceOrImport(\n \"agent/dist/index.js\",\n \"@earendil-works/pi-agent-core\",\n );\n const piTuiEntry = resolveWorkspaceOrImport(\n \"tui/dist/index.js\",\n \"@earendil-works/pi-tui\",\n );\n const piAiEntry = resolveWorkspaceOrImport(\n \"ai/dist/index.js\",\n \"@earendil-works/pi-ai\",\n );\n const piAiOauthEntry = resolveWorkspaceOrImport(\n \"ai/dist/oauth.js\",\n \"@earendil-works/pi-ai/oauth\",\n );\n\n _aliases = {\n \"@bastani/atomic\": piCodingAgentEntry,\n \"@earendil-works/pi-coding-agent\": piCodingAgentEntry,\n \"@earendil-works/pi-agent-core\": piAgentCoreEntry,\n \"@earendil-works/pi-tui\": piTuiEntry,\n \"@earendil-works/pi-ai\": piAiEntry,\n \"@earendil-works/pi-ai/oauth\": piAiOauthEntry,\n \"@mariozechner/pi-agent-core\": piAgentCoreEntry,\n \"@mariozechner/pi-tui\": piTuiEntry,\n \"@mariozechner/pi-ai\": piAiEntry,\n \"@mariozechner/pi-ai/oauth\": piAiOauthEntry,\n typebox: typeboxEntry,\n \"typebox/compile\": typeboxCompileEntry,\n \"typebox/value\": typeboxValueEntry,\n \"@sinclair/typebox\": typeboxEntry,\n \"@sinclair/typebox/compile\": typeboxCompileEntry,\n \"@sinclair/typebox/value\": typeboxValueEntry,\n };\n\n return _aliases;\n}\n\n\ntype HandlerFn = (...args: unknown[]) => Promise<unknown>;\n\nexport interface WorkflowResourceProvider {\n get(): ResolvedResource[];\n refresh?(): Promise<ResolvedResource[]>;\n}\n\nexport type WorkflowResourceProviderInput = WorkflowResourceProvider | ResolvedResource[];\n\nfunction createStaticWorkflowResourceProvider(workflowResources: ResolvedResource[]): WorkflowResourceProvider {\n return {\n get: () => workflowResources,\n };\n}\n\nfunction normalizeWorkflowResourceProvider(input: WorkflowResourceProviderInput): WorkflowResourceProvider {\n return Array.isArray(input) ? createStaticWorkflowResourceProvider(input) : input;\n}\n\nconst emptyWorkflowResourceProvider = createStaticWorkflowResourceProvider([]);\n\n/**\n * Create a runtime with throwing stubs for action methods.\n * Runner.bindCore() replaces these with real implementations.\n */\nexport function createExtensionRuntime(): ExtensionRuntime {\n const notInitialized = () => {\n throw new Error(\n \"Extension runtime not initialized. Action methods cannot be called during extension loading.\",\n );\n };\n const state: { staleMessage?: string } = {};\n const assertActive = () => {\n if (state.staleMessage) {\n throw new Error(state.staleMessage);\n }\n };\n\n const runtime: ExtensionRuntime = {\n sendMessage: notInitialized,\n sendUserMessage: notInitialized,\n appendEntry: notInitialized,\n setSessionName: notInitialized,\n getSessionName: notInitialized,\n setLabel: notInitialized,\n getActiveTools: notInitialized,\n getAllTools: notInitialized,\n setActiveTools: notInitialized,\n // registerTool() is valid during extension load; refresh is only needed post-bind.\n refreshTools: () => {},\n getCommands: notInitialized,\n setModel: () =>\n Promise.reject(new Error(\"Extension runtime not initialized\")),\n getThinkingLevel: notInitialized,\n setThinkingLevel: notInitialized,\n flagValues: new Map(),\n pendingProviderRegistrations: [],\n assertActive,\n invalidate: (message) => {\n state.staleMessage ??=\n message ??\n \"This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().\";\n },\n // Pre-bind: queue registrations so bindCore() can flush them once the\n // model registry is available. bindCore() replaces both with direct calls.\n registerProvider: (name, config, extensionPath = \"<unknown>\") => {\n runtime.pendingProviderRegistrations.push({\n name,\n config,\n extensionPath,\n });\n },\n unregisterProvider: (name) => {\n runtime.pendingProviderRegistrations =\n runtime.pendingProviderRegistrations.filter((r) => r.name !== name);\n },\n };\n\n return runtime;\n}\n\n/**\n * Create the ExtensionAPI for an extension.\n * Registration methods write to the extension object.\n * Action methods delegate to the shared runtime.\n */\nfunction createExtensionAPI(\n extension: Extension,\n runtime: ExtensionRuntime,\n cwd: string,\n eventBus: EventBus,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): ExtensionAPI {\n const workflowResources = normalizeWorkflowResourceProvider(workflowResourceProvider);\n const api = {\n // Registration methods - write to extension\n on(event: string, handler: HandlerFn): void {\n runtime.assertActive();\n const list = extension.handlers.get(event) ?? [];\n list.push(handler);\n extension.handlers.set(event, list);\n },\n\n registerTool(tool: ToolDefinition): void {\n runtime.assertActive();\n extension.tools.set(tool.name, {\n definition: tool,\n sourceInfo: extension.sourceInfo,\n });\n runtime.refreshTools();\n },\n\n registerCommand(\n name: string,\n options: Omit<RegisteredCommand, \"name\" | \"sourceInfo\">,\n ): void {\n runtime.assertActive();\n extension.commands.set(name, {\n name,\n sourceInfo: extension.sourceInfo,\n ...options,\n });\n },\n\n registerShortcut(\n shortcut: KeyId,\n options: {\n description?: string;\n handler: (\n ctx: import(\"./types.ts\").ExtensionContext,\n ) => Promise<void> | void;\n },\n ): void {\n runtime.assertActive();\n extension.shortcuts.set(shortcut, {\n shortcut,\n extensionPath: extension.path,\n ...options,\n });\n },\n\n registerFlag(\n name: string,\n options: {\n description?: string;\n type: \"boolean\" | \"string\";\n default?: boolean | string;\n },\n ): void {\n runtime.assertActive();\n extension.flags.set(name, {\n name,\n extensionPath: extension.path,\n ...options,\n });\n if (options.default !== undefined && !runtime.flagValues.has(name)) {\n runtime.flagValues.set(name, options.default);\n }\n },\n\n registerMessageRenderer<T>(\n customType: string,\n renderer: MessageRenderer<T>,\n ): void {\n runtime.assertActive();\n extension.messageRenderers.set(customType, renderer as MessageRenderer);\n },\n\n // Flag access - checks extension registered it, reads from runtime\n getFlag(name: string): boolean | string | undefined {\n runtime.assertActive();\n if (!extension.flags.has(name)) return undefined;\n return runtime.flagValues.get(name);\n },\n\n getWorkflowResources(): ResolvedResource[] {\n runtime.assertActive();\n return [...workflowResources.get()];\n },\n\n async refreshWorkflowResources(): Promise<ResolvedResource[]> {\n runtime.assertActive();\n const refreshed = await workflowResources.refresh?.();\n return [...(refreshed ?? workflowResources.get())];\n },\n\n // Action methods - delegate to shared runtime\n sendMessage(message, options): void {\n runtime.assertActive();\n runtime.sendMessage(message, options);\n },\n\n sendUserMessage(content, options): void {\n runtime.assertActive();\n runtime.sendUserMessage(content, options);\n },\n\n appendEntry(customType: string, data?: unknown): void {\n runtime.assertActive();\n runtime.appendEntry(customType, data);\n },\n\n setSessionName(name: string): void {\n runtime.assertActive();\n runtime.setSessionName(name);\n },\n\n getSessionName(): string | undefined {\n runtime.assertActive();\n return runtime.getSessionName();\n },\n\n setLabel(entryId: string, label: string | undefined): void {\n runtime.assertActive();\n runtime.setLabel(entryId, label);\n },\n\n exec(command: string, args: string[], options?: ExecOptions) {\n runtime.assertActive();\n return execCommand(command, args, options?.cwd ?? cwd, options);\n },\n\n getActiveTools(): string[] {\n runtime.assertActive();\n return runtime.getActiveTools();\n },\n\n getAllTools() {\n runtime.assertActive();\n return runtime.getAllTools();\n },\n\n setActiveTools(toolNames: string[]): void {\n runtime.assertActive();\n runtime.setActiveTools(toolNames);\n },\n\n getCommands() {\n runtime.assertActive();\n return runtime.getCommands();\n },\n\n setModel(model) {\n runtime.assertActive();\n return runtime.setModel(model);\n },\n\n getThinkingLevel() {\n runtime.assertActive();\n return runtime.getThinkingLevel();\n },\n\n setThinkingLevel(level) {\n runtime.assertActive();\n runtime.setThinkingLevel(level);\n },\n\n registerProvider(name: string, config: ProviderConfig) {\n runtime.assertActive();\n runtime.registerProvider(name, config, extension.path);\n },\n\n unregisterProvider(name: string) {\n runtime.assertActive();\n runtime.unregisterProvider(name, extension.path);\n },\n\n events: eventBus,\n } as ExtensionAPI;\n\n return api;\n}\n\nasync function loadExtensionModule(extensionPath: string) {\n const jiti = createJiti(import.meta.url, {\n moduleCache: false,\n // In Bun binary: use virtualModules for bundled packages (no filesystem resolution)\n // Also disable tryNative so jiti handles ALL imports (not just the entry point)\n // In Node.js/dev: use aliases to resolve to node_modules paths\n ...(isBunBinary\n ? { virtualModules: VIRTUAL_MODULES, tryNative: false }\n : { alias: getAliases() }),\n });\n\n const module = await jiti.import(extensionPath, { default: true });\n const factory = module as ExtensionFactory;\n return typeof factory !== \"function\" ? undefined : factory;\n}\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(\n extensionPath: string,\n resolvedPath: string,\n): Extension {\n const source =\n extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n : \"local\";\n const baseDir = extensionPath.startsWith(\"<\")\n ? undefined\n : path.dirname(resolvedPath);\n\n return {\n path: extensionPath,\n resolvedPath,\n sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n handlers: new Map(),\n tools: new Map(),\n messageRenderers: new Map(),\n commands: new Map(),\n flags: new Map(),\n shortcuts: new Map(),\n };\n}\n\nasync function loadExtension(\n extensionPath: string,\n cwd: string,\n eventBus: EventBus,\n runtime: ExtensionRuntime,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<{ extension: Extension | null; error: string | null }> {\n const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n try {\n const factory = await loadExtensionModule(resolvedPath);\n if (!factory) {\n return {\n extension: null,\n error: `Extension does not export a valid factory function: ${extensionPath}`,\n };\n }\n\n const extension = createExtension(extensionPath, resolvedPath);\n const api = createExtensionAPI(\n extension,\n runtime,\n cwd,\n eventBus,\n workflowResourceProvider,\n );\n await factory(api);\n\n return { extension, error: null };\n } catch (err) {\n const message = err instanceof Error ? err.message : String(err);\n return { extension: null, error: `Failed to load extension: ${message}` };\n }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n factory: ExtensionFactory,\n cwd: string,\n eventBus: EventBus,\n runtime: ExtensionRuntime,\n extensionPath = \"<inline>\",\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<Extension> {\n const extension = createExtension(extensionPath, extensionPath);\n const resolvedCwd = resolvePath(cwd);\n const api = createExtensionAPI(\n extension,\n runtime,\n resolvedCwd,\n eventBus,\n workflowResourceProvider,\n );\n await factory(api);\n return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nexport async function loadExtensions(\n paths: string[],\n cwd: string,\n eventBus?: EventBus,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<LoadExtensionsResult> {\n const extensions: Extension[] = [];\n const errors: Array<{ path: string; error: string }> = [];\n const resolvedCwd = resolvePath(cwd);\n const resolvedEventBus = eventBus ?? createEventBus();\n const runtime = createExtensionRuntime();\n\n for (const extPath of paths) {\n const { extension, error } = await loadExtension(\n extPath,\n resolvedCwd,\n resolvedEventBus,\n runtime,\n workflowResourceProvider,\n );\n\n if (error) {\n errors.push({ path: extPath, error });\n continue;\n }\n\n if (extension) {\n extensions.push(extension);\n }\n }\n\n return {\n extensions,\n errors,\n runtime,\n };\n}\n\ninterface PiManifest {\n extensions?: string[];\n themes?: string[];\n skills?: string[];\n prompts?: string[];\n}\n\nfunction manifestFromPackageJson(\n pkg: Record<string, unknown>,\n): PiManifest | null {\n const appManifest = pkg[APP_NAME];\n if (\n appManifest &&\n typeof appManifest === \"object\" &&\n !Array.isArray(appManifest)\n ) {\n return appManifest as PiManifest;\n }\n const legacyManifest = pkg.pi;\n if (\n legacyManifest &&\n typeof legacyManifest === \"object\" &&\n !Array.isArray(legacyManifest)\n ) {\n return legacyManifest as PiManifest;\n }\n return null;\n}\n\nfunction readPiManifest(packageJsonPath: string): PiManifest | null {\n try {\n const content = fs.readFileSync(packageJsonPath, \"utf-8\");\n const pkg = JSON.parse(content) as Record<string, unknown>;\n return manifestFromPackageJson(pkg);\n } catch {\n return null;\n }\n}\n\nfunction isExtensionFile(name: string): boolean {\n return name.endsWith(\".ts\") || name.endsWith(\".js\");\n}\n\n/**\n * Resolve extension entry points from a directory.\n *\n * Checks for:\n * 1. package.json with \"pi.extensions\" field -> returns declared paths\n * 2. index.ts or index.js -> returns the index file\n *\n * Returns resolved paths or null if no entry points found.\n */\nfunction resolveExtensionEntries(dir: string): string[] | null {\n // Check for package.json with \"pi\" field first\n const packageJsonPath = path.join(dir, \"package.json\");\n if (fs.existsSync(packageJsonPath)) {\n const manifest = readPiManifest(packageJsonPath);\n if (manifest?.extensions?.length) {\n const entries: string[] = [];\n for (const extPath of manifest.extensions) {\n const resolvedExtPath = path.resolve(dir, extPath);\n if (fs.existsSync(resolvedExtPath)) {\n entries.push(resolvedExtPath);\n }\n }\n if (entries.length > 0) {\n return entries;\n }\n }\n }\n\n // Check for index.ts or index.js\n const indexTs = path.join(dir, \"index.ts\");\n const indexJs = path.join(dir, \"index.js\");\n if (fs.existsSync(indexTs)) {\n return [indexTs];\n }\n if (fs.existsSync(indexJs)) {\n return [indexJs];\n }\n\n return null;\n}\n\n/**\n * Discover extensions in a directory.\n *\n * Discovery rules:\n * 1. Direct files: `extensions/*.ts` or `*.js` → load\n * 2. Subdirectory with index: `extensions/* /index.ts` or `index.js` → load\n * 3. Subdirectory with package.json: `extensions/* /package.json` with \"pi\" field → load what it declares\n *\n * No recursion beyond one level. Complex packages must use package.json manifest.\n */\nfunction discoverExtensionsInDir(dir: string): string[] {\n if (!fs.existsSync(dir)) {\n return [];\n }\n\n const discovered: string[] = [];\n\n try {\n const entries = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const entry of entries) {\n const entryPath = path.join(dir, entry.name);\n\n // 1. Direct files: *.ts or *.js\n if (\n (entry.isFile() || entry.isSymbolicLink()) &&\n isExtensionFile(entry.name)\n ) {\n discovered.push(entryPath);\n continue;\n }\n\n // 2 & 3. Subdirectories\n if (entry.isDirectory() || entry.isSymbolicLink()) {\n const entries = resolveExtensionEntries(entryPath);\n if (entries) {\n discovered.push(...entries);\n }\n }\n }\n } catch {\n return [];\n }\n\n return discovered;\n}\n\n/**\n * Discover and load extensions from standard locations.\n */\nexport async function discoverAndLoadExtensions(\n configuredPaths: string[],\n cwd: string,\n agentDir: string = getAgentDir(),\n eventBus?: EventBus,\n): Promise<LoadExtensionsResult> {\n const resolvedCwd = resolvePath(cwd);\n const resolvedAgentDir = resolvePath(agentDir);\n const allPaths: string[] = [];\n const seen = new Set<string>();\n\n const addPaths = (paths: string[]) => {\n for (const p of paths) {\n const resolved = path.resolve(p);\n if (!seen.has(resolved)) {\n seen.add(resolved);\n allPaths.push(p);\n }\n }\n };\n\n // 1. Project-local extensions: cwd/${CONFIG_DIR_NAME}/extensions/\n const localExtDir = path.join(resolvedCwd, CONFIG_DIR_NAME, \"extensions\");\n addPaths(discoverExtensionsInDir(localExtDir));\n\n // 2. Global extensions: agentDir/extensions/\n const globalExtDir = path.join(resolvedAgentDir, \"extensions\");\n addPaths(discoverExtensionsInDir(globalExtDir));\n\n // 3. Explicitly configured paths\n for (const p of configuredPaths) {\n const resolved = resolvePath(p, resolvedCwd, { normalizeUnicodeSpaces: true });\n if (fs.existsSync(resolved) && fs.statSync(resolved).isDirectory()) {\n // Check for package.json with pi manifest or index.ts\n const entries = resolveExtensionEntries(resolved);\n if (entries) {\n addPaths(entries);\n continue;\n }\n // No explicit entries - discover individual files in directory\n addPaths(discoverExtensionsInDir(resolved));\n continue;\n }\n\n addPaths([resolved]);\n }\n\n return loadExtensions(allPaths, resolvedCwd, eventBus);\n\n}\n"]}
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/loader.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA6BH,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAI9D,OAAO,KAAK,EACV,SAAS,EAET,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAKrB,MAAM,YAAY,CAAC;AA8FpB,MAAM,WAAW,wBAAwB;IACvC,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAC1B,OAAO,CAAC,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,6BAA6B,GAAG,wBAAwB,GAAG,gBAAgB,EAAE,CAAC;AAc1F;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,gBAAgB,CAsDzD;AAqRD;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,gBAAgB,EACzB,aAAa,SAAa,EAC1B,wBAAwB,GAAE,6BAA6D,GACtF,OAAO,CAAC,SAAS,CAAC,CAYpB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,EAAE,MAAM,EACX,QAAQ,CAAC,EAAE,QAAQ,EACnB,wBAAwB,GAAE,6BAA6D,GACtF,OAAO,CAAC,oBAAoB,CAAC,CAiC/B;AAqID;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,eAAe,EAAE,MAAM,EAAE,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,GAAE,MAAsB,EAChC,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,oBAAoB,CAAC,CA4C/B","sourcesContent":["/**\n * Extension loader - loads TypeScript extension modules using jiti.\n *\n */\n\nimport * as fs from \"node:fs\";\nimport { createRequire } from \"node:module\";\nimport * as path from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport * as _bundledPiAgentCore from \"@earendil-works/pi-agent-core\";\nimport * as _bundledPiAi from \"@earendil-works/pi-ai\";\nimport * as _bundledPiAiOauth from \"@earendil-works/pi-ai/oauth\";\nimport type { KeyId } from \"@earendil-works/pi-tui\";\nimport * as _bundledPiTui from \"@earendil-works/pi-tui\";\nimport { createJiti } from \"jiti/static\";\n// Static imports of packages that extensions may use.\n// These MUST be static so Bun bundles them into the compiled binary.\n// The virtualModules option then makes them available to extensions.\nimport * as _bundledTypebox from \"typebox\";\nimport * as _bundledTypeboxCompile from \"typebox/compile\";\nimport * as _bundledTypeboxValue from \"typebox/value\";\nimport {\n APP_NAME,\n CONFIG_DIR_NAME,\n getAgentDir,\n isBunBinary,\n} from \"../../config.ts\";\n// NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,\n// avoiding a circular dependency. Extensions can import from the Atomic package\n// name (or upstream-compatible pi package names).\nimport * as _bundledPiCodingAgent from \"../../index.ts\";\nimport { resolvePath } from \"../../utils/paths.ts\";\nimport { createEventBus, type EventBus } from \"../event-bus.ts\";\nimport type { ExecOptions } from \"../exec.ts\";\nimport type { ResolvedResource } from \"../package-manager.ts\";\nimport { execCommand } from \"../exec.ts\";\nimport { createSyntheticSourceInfo } from \"../source-info.ts\";\nimport { endTimingSpan, startTimingSpan } from \"../timings.ts\";\nimport type {\n Extension,\n ExtensionAPI,\n ExtensionFactory,\n ExtensionRuntime,\n LoadExtensionsResult,\n MessageRenderer,\n ProviderConfig,\n RegisteredCommand,\n ToolDefinition,\n} from \"./types.ts\";\n\n/** Modules available to extensions via virtualModules (for compiled Bun binary) */\nconst VIRTUAL_MODULES: Record<string, unknown> = {\n typebox: _bundledTypebox,\n \"typebox/compile\": _bundledTypeboxCompile,\n \"typebox/value\": _bundledTypeboxValue,\n \"@sinclair/typebox\": _bundledTypebox,\n \"@sinclair/typebox/compile\": _bundledTypeboxCompile,\n \"@sinclair/typebox/value\": _bundledTypeboxValue,\n \"@earendil-works/pi-agent-core\": _bundledPiAgentCore,\n \"@earendil-works/pi-tui\": _bundledPiTui,\n \"@earendil-works/pi-ai\": _bundledPiAi,\n \"@earendil-works/pi-ai/oauth\": _bundledPiAiOauth,\n \"@bastani/atomic\": _bundledPiCodingAgent,\n \"@mariozechner/pi-agent-core\": _bundledPiAgentCore,\n \"@mariozechner/pi-tui\": _bundledPiTui,\n \"@mariozechner/pi-ai\": _bundledPiAi,\n \"@mariozechner/pi-ai/oauth\": _bundledPiAiOauth,\n};\n\nconst require = createRequire(import.meta.url);\n\n/**\n * Get aliases for jiti (used in Node.js/development mode).\n * In Bun binary mode, virtualModules is used instead.\n */\nlet _aliases: Record<string, string> | null = null;\n\nfunction getAliases(): Record<string, string> {\n if (_aliases) return _aliases;\n\n const __dirname = path.dirname(fileURLToPath(import.meta.url));\n const packageIndex = path.resolve(__dirname, \"../..\", \"index.js\");\n\n const typeboxEntry = require.resolve(\"typebox\");\n const typeboxCompileEntry = require.resolve(\"typebox/compile\");\n const typeboxValueEntry = require.resolve(\"typebox/value\");\n\n const packagesRoot = path.resolve(__dirname, \"../../../../\");\n const resolveWorkspaceOrImport = (\n workspaceRelativePath: string,\n specifier: string,\n ): string => {\n const workspacePath = path.join(packagesRoot, workspaceRelativePath);\n if (fs.existsSync(workspacePath)) {\n return workspacePath;\n }\n return fileURLToPath(import.meta.resolve(specifier));\n };\n\n const piCodingAgentEntry = packageIndex;\n const piAgentCoreEntry = resolveWorkspaceOrImport(\n \"agent/dist/index.js\",\n \"@earendil-works/pi-agent-core\",\n );\n const piTuiEntry = resolveWorkspaceOrImport(\n \"tui/dist/index.js\",\n \"@earendil-works/pi-tui\",\n );\n const piAiEntry = resolveWorkspaceOrImport(\n \"ai/dist/index.js\",\n \"@earendil-works/pi-ai\",\n );\n const piAiOauthEntry = resolveWorkspaceOrImport(\n \"ai/dist/oauth.js\",\n \"@earendil-works/pi-ai/oauth\",\n );\n\n _aliases = {\n \"@bastani/atomic\": piCodingAgentEntry,\n \"@earendil-works/pi-coding-agent\": piCodingAgentEntry,\n \"@earendil-works/pi-agent-core\": piAgentCoreEntry,\n \"@earendil-works/pi-tui\": piTuiEntry,\n \"@earendil-works/pi-ai\": piAiEntry,\n \"@earendil-works/pi-ai/oauth\": piAiOauthEntry,\n \"@mariozechner/pi-agent-core\": piAgentCoreEntry,\n \"@mariozechner/pi-tui\": piTuiEntry,\n \"@mariozechner/pi-ai\": piAiEntry,\n \"@mariozechner/pi-ai/oauth\": piAiOauthEntry,\n typebox: typeboxEntry,\n \"typebox/compile\": typeboxCompileEntry,\n \"typebox/value\": typeboxValueEntry,\n \"@sinclair/typebox\": typeboxEntry,\n \"@sinclair/typebox/compile\": typeboxCompileEntry,\n \"@sinclair/typebox/value\": typeboxValueEntry,\n };\n\n return _aliases;\n}\n\n\ntype HandlerFn = (...args: unknown[]) => Promise<unknown>;\n\nexport interface WorkflowResourceProvider {\n get(): ResolvedResource[];\n refresh?(): Promise<ResolvedResource[]>;\n}\n\nexport type WorkflowResourceProviderInput = WorkflowResourceProvider | ResolvedResource[];\n\nfunction createStaticWorkflowResourceProvider(workflowResources: ResolvedResource[]): WorkflowResourceProvider {\n return {\n get: () => workflowResources,\n };\n}\n\nfunction normalizeWorkflowResourceProvider(input: WorkflowResourceProviderInput): WorkflowResourceProvider {\n return Array.isArray(input) ? createStaticWorkflowResourceProvider(input) : input;\n}\n\nconst emptyWorkflowResourceProvider = createStaticWorkflowResourceProvider([]);\n\n/**\n * Create a runtime with throwing stubs for action methods.\n * Runner.bindCore() replaces these with real implementations.\n */\nexport function createExtensionRuntime(): ExtensionRuntime {\n const notInitialized = () => {\n throw new Error(\n \"Extension runtime not initialized. Action methods cannot be called during extension loading.\",\n );\n };\n const state: { staleMessage?: string } = {};\n const assertActive = () => {\n if (state.staleMessage) {\n throw new Error(state.staleMessage);\n }\n };\n\n const runtime: ExtensionRuntime = {\n sendMessage: notInitialized,\n sendUserMessage: notInitialized,\n appendEntry: notInitialized,\n setSessionName: notInitialized,\n getSessionName: notInitialized,\n setLabel: notInitialized,\n getActiveTools: notInitialized,\n getAllTools: notInitialized,\n setActiveTools: notInitialized,\n // registerTool() is valid during extension load; refresh is only needed post-bind.\n refreshTools: () => {},\n getCommands: notInitialized,\n setModel: () =>\n Promise.reject(new Error(\"Extension runtime not initialized\")),\n getThinkingLevel: notInitialized,\n setThinkingLevel: notInitialized,\n flagValues: new Map(),\n pendingProviderRegistrations: [],\n assertActive,\n invalidate: (message) => {\n state.staleMessage ??=\n message ??\n \"This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().\";\n },\n // Pre-bind: queue registrations so bindCore() can flush them once the\n // model registry is available. bindCore() replaces both with direct calls.\n registerProvider: (name, config, extensionPath = \"<unknown>\") => {\n runtime.pendingProviderRegistrations.push({\n name,\n config,\n extensionPath,\n });\n },\n unregisterProvider: (name) => {\n runtime.pendingProviderRegistrations =\n runtime.pendingProviderRegistrations.filter((r) => r.name !== name);\n },\n };\n\n return runtime;\n}\n\n/**\n * Create the ExtensionAPI for an extension.\n * Registration methods write to the extension object.\n * Action methods delegate to the shared runtime.\n */\nfunction createExtensionAPI(\n extension: Extension,\n runtime: ExtensionRuntime,\n cwd: string,\n eventBus: EventBus,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): ExtensionAPI {\n const workflowResources = normalizeWorkflowResourceProvider(workflowResourceProvider);\n const api = {\n // Registration methods - write to extension\n on(event: string, handler: HandlerFn): void {\n runtime.assertActive();\n const list = extension.handlers.get(event) ?? [];\n list.push(handler);\n extension.handlers.set(event, list);\n },\n\n registerTool(tool: ToolDefinition): void {\n runtime.assertActive();\n extension.tools.set(tool.name, {\n definition: tool,\n sourceInfo: extension.sourceInfo,\n });\n runtime.refreshTools();\n },\n\n registerCommand(\n name: string,\n options: Omit<RegisteredCommand, \"name\" | \"sourceInfo\">,\n ): void {\n runtime.assertActive();\n extension.commands.set(name, {\n name,\n sourceInfo: extension.sourceInfo,\n ...options,\n });\n },\n\n registerShortcut(\n shortcut: KeyId,\n options: {\n description?: string;\n handler: (\n ctx: import(\"./types.ts\").ExtensionContext,\n ) => Promise<void> | void;\n },\n ): void {\n runtime.assertActive();\n extension.shortcuts.set(shortcut, {\n shortcut,\n extensionPath: extension.path,\n ...options,\n });\n },\n\n registerFlag(\n name: string,\n options: {\n description?: string;\n type: \"boolean\" | \"string\";\n default?: boolean | string;\n },\n ): void {\n runtime.assertActive();\n extension.flags.set(name, {\n name,\n extensionPath: extension.path,\n ...options,\n });\n if (options.default !== undefined && !runtime.flagValues.has(name)) {\n runtime.flagValues.set(name, options.default);\n }\n },\n\n registerMessageRenderer<T>(\n customType: string,\n renderer: MessageRenderer<T>,\n ): void {\n runtime.assertActive();\n extension.messageRenderers.set(customType, renderer as MessageRenderer);\n },\n\n // Flag access - checks extension registered it, reads from runtime\n getFlag(name: string): boolean | string | undefined {\n runtime.assertActive();\n if (!extension.flags.has(name)) return undefined;\n return runtime.flagValues.get(name);\n },\n\n getWorkflowResources(): ResolvedResource[] {\n runtime.assertActive();\n return [...workflowResources.get()];\n },\n\n async refreshWorkflowResources(): Promise<ResolvedResource[]> {\n runtime.assertActive();\n const refreshed = await workflowResources.refresh?.();\n return [...(refreshed ?? workflowResources.get())];\n },\n\n // Action methods - delegate to shared runtime\n sendMessage(message, options): void {\n runtime.assertActive();\n runtime.sendMessage(message, options);\n },\n\n sendUserMessage(content, options): void {\n runtime.assertActive();\n runtime.sendUserMessage(content, options);\n },\n\n appendEntry(customType: string, data?: unknown): void {\n runtime.assertActive();\n runtime.appendEntry(customType, data);\n },\n\n setSessionName(name: string): void {\n runtime.assertActive();\n runtime.setSessionName(name);\n },\n\n getSessionName(): string | undefined {\n runtime.assertActive();\n return runtime.getSessionName();\n },\n\n setLabel(entryId: string, label: string | undefined): void {\n runtime.assertActive();\n runtime.setLabel(entryId, label);\n },\n\n exec(command: string, args: string[], options?: ExecOptions) {\n runtime.assertActive();\n return execCommand(command, args, options?.cwd ?? cwd, options);\n },\n\n getActiveTools(): string[] {\n runtime.assertActive();\n return runtime.getActiveTools();\n },\n\n getAllTools() {\n runtime.assertActive();\n return runtime.getAllTools();\n },\n\n setActiveTools(toolNames: string[]): void {\n runtime.assertActive();\n runtime.setActiveTools(toolNames);\n },\n\n getCommands() {\n runtime.assertActive();\n return runtime.getCommands();\n },\n\n setModel(model) {\n runtime.assertActive();\n return runtime.setModel(model);\n },\n\n getThinkingLevel() {\n runtime.assertActive();\n return runtime.getThinkingLevel();\n },\n\n setThinkingLevel(level) {\n runtime.assertActive();\n runtime.setThinkingLevel(level);\n },\n\n registerProvider(name: string, config: ProviderConfig) {\n runtime.assertActive();\n runtime.registerProvider(name, config, extension.path);\n },\n\n unregisterProvider(name: string) {\n runtime.assertActive();\n runtime.unregisterProvider(name, extension.path);\n },\n\n events: eventBus,\n } as ExtensionAPI;\n\n return api;\n}\n\nasync function loadExtensionModule(extensionPath: string) {\n const jiti = createJiti(import.meta.url, {\n moduleCache: false,\n // In Bun binary: use virtualModules for bundled packages (no filesystem resolution)\n // Also disable tryNative so jiti handles ALL imports (not just the entry point)\n // In Node.js/dev: use aliases to resolve to node_modules paths\n ...(isBunBinary\n ? { virtualModules: VIRTUAL_MODULES, tryNative: false }\n : { alias: getAliases() }),\n });\n\n const module = await jiti.import(extensionPath, { default: true });\n const factory = module as ExtensionFactory;\n return typeof factory !== \"function\" ? undefined : factory;\n}\n\n/**\n * Create an Extension object with empty collections.\n */\nfunction createExtension(\n extensionPath: string,\n resolvedPath: string,\n): Extension {\n const source =\n extensionPath.startsWith(\"<\") && extensionPath.endsWith(\">\")\n ? extensionPath.slice(1, -1).split(\":\")[0] || \"temporary\"\n : \"local\";\n const baseDir = extensionPath.startsWith(\"<\")\n ? undefined\n : path.dirname(resolvedPath);\n\n return {\n path: extensionPath,\n resolvedPath,\n sourceInfo: createSyntheticSourceInfo(extensionPath, { source, baseDir }),\n handlers: new Map(),\n tools: new Map(),\n messageRenderers: new Map(),\n commands: new Map(),\n flags: new Map(),\n shortcuts: new Map(),\n };\n}\n\nasync function loadExtension(\n extensionPath: string,\n cwd: string,\n eventBus: EventBus,\n runtime: ExtensionRuntime,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<{ extension: Extension | null; error: string | null }> {\n const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });\n\n try {\n const moduleSpan = startTimingSpan(`loadExtensions.${extensionPath}.module`);\n const factory = await loadExtensionModule(resolvedPath);\n endTimingSpan(moduleSpan);\n if (!factory) {\n return {\n extension: null,\n error: `Extension does not export a valid factory function: ${extensionPath}`,\n };\n }\n\n const extension = createExtension(extensionPath, resolvedPath);\n const api = createExtensionAPI(\n extension,\n runtime,\n cwd,\n eventBus,\n workflowResourceProvider,\n );\n const factorySpan = startTimingSpan(`loadExtensions.${extensionPath}.factory`);\n await factory(api);\n endTimingSpan(factorySpan);\n\n return { extension, error: null };\n } catch (err) {\n const message = err instanceof Error ? err.message : String(err);\n return { extension: null, error: `Failed to load extension: ${message}` };\n }\n}\n\n/**\n * Create an Extension from an inline factory function.\n */\nexport async function loadExtensionFromFactory(\n factory: ExtensionFactory,\n cwd: string,\n eventBus: EventBus,\n runtime: ExtensionRuntime,\n extensionPath = \"<inline>\",\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<Extension> {\n const extension = createExtension(extensionPath, extensionPath);\n const resolvedCwd = resolvePath(cwd);\n const api = createExtensionAPI(\n extension,\n runtime,\n resolvedCwd,\n eventBus,\n workflowResourceProvider,\n );\n await factory(api);\n return extension;\n}\n\n/**\n * Load extensions from paths.\n */\nexport async function loadExtensions(\n paths: string[],\n cwd: string,\n eventBus?: EventBus,\n workflowResourceProvider: WorkflowResourceProviderInput = emptyWorkflowResourceProvider,\n): Promise<LoadExtensionsResult> {\n const extensions: Extension[] = [];\n const errors: Array<{ path: string; error: string }> = [];\n const resolvedCwd = resolvePath(cwd);\n const resolvedEventBus = eventBus ?? createEventBus();\n const runtime = createExtensionRuntime();\n\n for (const extPath of paths) {\n const extensionSpan = startTimingSpan(`loadExtensions.${extPath}.total`);\n const { extension, error } = await loadExtension(\n extPath,\n resolvedCwd,\n resolvedEventBus,\n runtime,\n workflowResourceProvider,\n );\n endTimingSpan(extensionSpan);\n\n if (error) {\n errors.push({ path: extPath, error });\n continue;\n }\n\n if (extension) {\n extensions.push(extension);\n }\n }\n\n return {\n extensions,\n errors,\n runtime,\n };\n}\n\ninterface PiManifest {\n extensions?: string[];\n themes?: string[];\n skills?: string[];\n prompts?: string[];\n}\n\nfunction manifestFromPackageJson(\n pkg: Record<string, unknown>,\n): PiManifest | null {\n const appManifest = pkg[APP_NAME];\n if (\n appManifest &&\n typeof appManifest === \"object\" &&\n !Array.isArray(appManifest)\n ) {\n return appManifest as PiManifest;\n }\n const legacyManifest = pkg.pi;\n if (\n legacyManifest &&\n typeof legacyManifest === \"object\" &&\n !Array.isArray(legacyManifest)\n ) {\n return legacyManifest as PiManifest;\n }\n return null;\n}\n\nfunction readPiManifest(packageJsonPath: string): PiManifest | null {\n try {\n const content = fs.readFileSync(packageJsonPath, \"utf-8\");\n const pkg = JSON.parse(content) as Record<string, unknown>;\n return manifestFromPackageJson(pkg);\n } catch {\n return null;\n }\n}\n\nfunction isExtensionFile(name: string): boolean {\n return name.endsWith(\".ts\") || name.endsWith(\".js\");\n}\n\n/**\n * Resolve extension entry points from a directory.\n *\n * Checks for:\n * 1. package.json with \"pi.extensions\" field -> returns declared paths\n * 2. index.ts or index.js -> returns the index file\n *\n * Returns resolved paths or null if no entry points found.\n */\nfunction resolveExtensionEntries(dir: string): string[] | null {\n // Check for package.json with \"pi\" field first\n const packageJsonPath = path.join(dir, \"package.json\");\n if (fs.existsSync(packageJsonPath)) {\n const manifest = readPiManifest(packageJsonPath);\n if (manifest?.extensions?.length) {\n const entries: string[] = [];\n for (const extPath of manifest.extensions) {\n const resolvedExtPath = path.resolve(dir, extPath);\n if (fs.existsSync(resolvedExtPath)) {\n entries.push(resolvedExtPath);\n }\n }\n if (entries.length > 0) {\n return entries;\n }\n }\n }\n\n // Check for index.ts or index.js\n const indexTs = path.join(dir, \"index.ts\");\n const indexJs = path.join(dir, \"index.js\");\n if (fs.existsSync(indexTs)) {\n return [indexTs];\n }\n if (fs.existsSync(indexJs)) {\n return [indexJs];\n }\n\n return null;\n}\n\n/**\n * Discover extensions in a directory.\n *\n * Discovery rules:\n * 1. Direct files: `extensions/*.ts` or `*.js` → load\n * 2. Subdirectory with index: `extensions/* /index.ts` or `index.js` → load\n * 3. Subdirectory with package.json: `extensions/* /package.json` with \"pi\" field → load what it declares\n *\n * No recursion beyond one level. Complex packages must use package.json manifest.\n */\nfunction discoverExtensionsInDir(dir: string): string[] {\n if (!fs.existsSync(dir)) {\n return [];\n }\n\n const discovered: string[] = [];\n\n try {\n const entries = fs.readdirSync(dir, { withFileTypes: true });\n\n for (const entry of entries) {\n const entryPath = path.join(dir, entry.name);\n\n // 1. Direct files: *.ts or *.js\n if (\n (entry.isFile() || entry.isSymbolicLink()) &&\n isExtensionFile(entry.name)\n ) {\n discovered.push(entryPath);\n continue;\n }\n\n // 2 & 3. Subdirectories\n if (entry.isDirectory() || entry.isSymbolicLink()) {\n const entries = resolveExtensionEntries(entryPath);\n if (entries) {\n discovered.push(...entries);\n }\n }\n }\n } catch {\n return [];\n }\n\n return discovered;\n}\n\n/**\n * Discover and load extensions from standard locations.\n */\nexport async function discoverAndLoadExtensions(\n configuredPaths: string[],\n cwd: string,\n agentDir: string = getAgentDir(),\n eventBus?: EventBus,\n): Promise<LoadExtensionsResult> {\n const resolvedCwd = resolvePath(cwd);\n const resolvedAgentDir = resolvePath(agentDir);\n const allPaths: string[] = [];\n const seen = new Set<string>();\n\n const addPaths = (paths: string[]) => {\n for (const p of paths) {\n const resolved = path.resolve(p);\n if (!seen.has(resolved)) {\n seen.add(resolved);\n allPaths.push(p);\n }\n }\n };\n\n // 1. Project-local extensions: cwd/${CONFIG_DIR_NAME}/extensions/\n const localExtDir = path.join(resolvedCwd, CONFIG_DIR_NAME, \"extensions\");\n addPaths(discoverExtensionsInDir(localExtDir));\n\n // 2. Global extensions: agentDir/extensions/\n const globalExtDir = path.join(resolvedAgentDir, \"extensions\");\n addPaths(discoverExtensionsInDir(globalExtDir));\n\n // 3. Explicitly configured paths\n for (const p of configuredPaths) {\n const resolved = resolvePath(p, resolvedCwd, { normalizeUnicodeSpaces: true });\n if (fs.existsSync(resolved) && fs.statSync(resolved).isDirectory()) {\n // Check for package.json with pi manifest or index.ts\n const entries = resolveExtensionEntries(resolved);\n if (entries) {\n addPaths(entries);\n continue;\n }\n // No explicit entries - discover individual files in directory\n addPaths(discoverExtensionsInDir(resolved));\n continue;\n }\n\n addPaths([resolved]);\n }\n\n return loadExtensions(allPaths, resolvedCwd, eventBus);\n\n}\n"]}
|