@draht/coding-agent 2026.4.5 → 2026.4.25

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.
Files changed (234) hide show
  1. package/CHANGELOG.md +792 -625
  2. package/README.md +24 -15
  3. package/dist/cli/args.d.ts +7 -10
  4. package/dist/cli/args.d.ts.map +1 -1
  5. package/dist/cli/args.js +44 -46
  6. package/dist/cli/args.js.map +1 -1
  7. package/dist/cli.d.ts.map +1 -1
  8. package/dist/cli.js +1 -0
  9. package/dist/cli.js.map +1 -1
  10. package/dist/config.d.ts +9 -0
  11. package/dist/config.d.ts.map +1 -1
  12. package/dist/config.js +18 -0
  13. package/dist/config.js.map +1 -1
  14. package/dist/core/agent-session-runtime.d.ts +53 -106
  15. package/dist/core/agent-session-runtime.d.ts.map +1 -1
  16. package/dist/core/agent-session-runtime.js +116 -147
  17. package/dist/core/agent-session-runtime.js.map +1 -1
  18. package/dist/core/agent-session-services.d.ts +86 -0
  19. package/dist/core/agent-session-services.d.ts.map +1 -0
  20. package/dist/core/agent-session-services.js +116 -0
  21. package/dist/core/agent-session-services.js.map +1 -0
  22. package/dist/core/agent-session.d.ts +8 -12
  23. package/dist/core/agent-session.d.ts.map +1 -1
  24. package/dist/core/agent-session.js +134 -45
  25. package/dist/core/agent-session.js.map +1 -1
  26. package/dist/core/bash-executor.d.ts.map +1 -1
  27. package/dist/core/bash-executor.js +19 -7
  28. package/dist/core/bash-executor.js.map +1 -1
  29. package/dist/core/compaction/compaction.d.ts +1 -1
  30. package/dist/core/compaction/compaction.d.ts.map +1 -1
  31. package/dist/core/compaction/compaction.js +18 -17
  32. package/dist/core/compaction/compaction.js.map +1 -1
  33. package/dist/core/extensions/index.d.ts +1 -1
  34. package/dist/core/extensions/index.d.ts.map +1 -1
  35. package/dist/core/extensions/index.js.map +1 -1
  36. package/dist/core/extensions/loader.d.ts.map +1 -1
  37. package/dist/core/extensions/loader.js +7 -7
  38. package/dist/core/extensions/loader.js.map +1 -1
  39. package/dist/core/extensions/runner.d.ts +1 -0
  40. package/dist/core/extensions/runner.d.ts.map +1 -1
  41. package/dist/core/extensions/runner.js +4 -0
  42. package/dist/core/extensions/runner.js.map +1 -1
  43. package/dist/core/extensions/types.d.ts +15 -14
  44. package/dist/core/extensions/types.d.ts.map +1 -1
  45. package/dist/core/extensions/types.js.map +1 -1
  46. package/dist/core/index.d.ts +2 -1
  47. package/dist/core/index.d.ts.map +1 -1
  48. package/dist/core/index.js +2 -1
  49. package/dist/core/index.js.map +1 -1
  50. package/dist/core/keybindings.d.ts +14 -1
  51. package/dist/core/keybindings.d.ts.map +1 -1
  52. package/dist/core/keybindings.js +13 -14
  53. package/dist/core/keybindings.js.map +1 -1
  54. package/dist/core/model-registry.d.ts.map +1 -1
  55. package/dist/core/model-registry.js +31 -1
  56. package/dist/core/model-registry.js.map +1 -1
  57. package/dist/core/package-manager.d.ts +21 -1
  58. package/dist/core/package-manager.d.ts.map +1 -1
  59. package/dist/core/package-manager.js +108 -43
  60. package/dist/core/package-manager.js.map +1 -1
  61. package/dist/core/prompt-templates.d.ts.map +1 -1
  62. package/dist/core/prompt-templates.js +22 -21
  63. package/dist/core/prompt-templates.js.map +1 -1
  64. package/dist/core/resource-loader.d.ts +0 -2
  65. package/dist/core/resource-loader.d.ts.map +1 -1
  66. package/dist/core/resource-loader.js +26 -8
  67. package/dist/core/resource-loader.js.map +1 -1
  68. package/dist/core/sdk.d.ts +2 -2
  69. package/dist/core/sdk.d.ts.map +1 -1
  70. package/dist/core/sdk.js +2 -2
  71. package/dist/core/sdk.js.map +1 -1
  72. package/dist/core/session-cwd.d.ts +19 -0
  73. package/dist/core/session-cwd.d.ts.map +1 -0
  74. package/dist/core/session-cwd.js +38 -0
  75. package/dist/core/session-cwd.js.map +1 -0
  76. package/dist/core/session-manager.d.ts +5 -1
  77. package/dist/core/session-manager.d.ts.map +1 -1
  78. package/dist/core/session-manager.js +16 -8
  79. package/dist/core/session-manager.js.map +1 -1
  80. package/dist/core/settings-manager.d.ts +6 -4
  81. package/dist/core/settings-manager.d.ts.map +1 -1
  82. package/dist/core/settings-manager.js +5 -1
  83. package/dist/core/settings-manager.js.map +1 -1
  84. package/dist/core/skills.d.ts +1 -1
  85. package/dist/core/skills.d.ts.map +1 -1
  86. package/dist/core/skills.js +3 -3
  87. package/dist/core/skills.js.map +1 -1
  88. package/dist/core/system-prompt.d.ts.map +1 -1
  89. package/dist/core/system-prompt.js +6 -6
  90. package/dist/core/system-prompt.js.map +1 -1
  91. package/dist/core/timings.d.ts +1 -0
  92. package/dist/core/timings.d.ts.map +1 -1
  93. package/dist/core/timings.js +6 -0
  94. package/dist/core/timings.js.map +1 -1
  95. package/dist/core/tools/bash.d.ts.map +1 -1
  96. package/dist/core/tools/bash.js +19 -9
  97. package/dist/core/tools/bash.js.map +1 -1
  98. package/dist/core/tools/edit-diff.d.ts +23 -1
  99. package/dist/core/tools/edit-diff.d.ts.map +1 -1
  100. package/dist/core/tools/edit-diff.js +150 -57
  101. package/dist/core/tools/edit-diff.js.map +1 -1
  102. package/dist/core/tools/edit.d.ts +13 -11
  103. package/dist/core/tools/edit.d.ts.map +1 -1
  104. package/dist/core/tools/edit.js +55 -77
  105. package/dist/core/tools/edit.js.map +1 -1
  106. package/dist/core/tools/file-mutation-queue.d.ts.map +1 -1
  107. package/dist/core/tools/file-mutation-queue.js +4 -4
  108. package/dist/core/tools/file-mutation-queue.js.map +1 -1
  109. package/dist/core/tools/index.d.ts +9 -6
  110. package/dist/core/tools/index.d.ts.map +1 -1
  111. package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
  112. package/dist/core/tools/tool-definition-wrapper.js +2 -0
  113. package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
  114. package/dist/index.d.ts +4 -4
  115. package/dist/index.d.ts.map +1 -1
  116. package/dist/index.js +4 -5
  117. package/dist/index.js.map +1 -1
  118. package/dist/main.d.ts.map +1 -1
  119. package/dist/main.js +252 -451
  120. package/dist/main.js.map +1 -1
  121. package/dist/migrations.d.ts +3 -3
  122. package/dist/migrations.d.ts.map +1 -1
  123. package/dist/migrations.js +25 -5
  124. package/dist/migrations.js.map +1 -1
  125. package/dist/modes/interactive/components/assistant-message.d.ts +3 -1
  126. package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
  127. package/dist/modes/interactive/components/assistant-message.js +14 -3
  128. package/dist/modes/interactive/components/assistant-message.js.map +1 -1
  129. package/dist/modes/interactive/components/earendil-announcement.d.ts +5 -0
  130. package/dist/modes/interactive/components/earendil-announcement.d.ts.map +1 -0
  131. package/dist/modes/interactive/components/earendil-announcement.js +40 -0
  132. package/dist/modes/interactive/components/earendil-announcement.js.map +1 -0
  133. package/dist/modes/interactive/components/settings-selector.d.ts.map +1 -1
  134. package/dist/modes/interactive/components/settings-selector.js +1 -0
  135. package/dist/modes/interactive/components/settings-selector.js.map +1 -1
  136. package/dist/modes/interactive/components/thinking-selector.d.ts.map +1 -1
  137. package/dist/modes/interactive/components/thinking-selector.js +1 -0
  138. package/dist/modes/interactive/components/thinking-selector.js.map +1 -1
  139. package/dist/modes/interactive/components/tool-execution.d.ts +0 -1
  140. package/dist/modes/interactive/components/tool-execution.d.ts.map +1 -1
  141. package/dist/modes/interactive/components/tool-execution.js +2 -7
  142. package/dist/modes/interactive/components/tool-execution.js.map +1 -1
  143. package/dist/modes/interactive/components/tree-selector.d.ts +4 -2
  144. package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
  145. package/dist/modes/interactive/components/tree-selector.js +48 -15
  146. package/dist/modes/interactive/components/tree-selector.js.map +1 -1
  147. package/dist/modes/interactive/interactive-mode.d.ts +12 -3
  148. package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
  149. package/dist/modes/interactive/interactive-mode.js +237 -125
  150. package/dist/modes/interactive/interactive-mode.js.map +1 -1
  151. package/dist/modes/interactive/theme/dark.json +8 -5
  152. package/dist/modes/interactive/theme/light.json +8 -5
  153. package/dist/modes/interactive/theme/theme-schema.json +6 -1
  154. package/dist/modes/interactive/theme/theme.d.ts +2 -2
  155. package/dist/modes/interactive/theme/theme.d.ts.map +1 -1
  156. package/dist/modes/interactive/theme/theme.js +13 -1
  157. package/dist/modes/interactive/theme/theme.js.map +1 -1
  158. package/dist/modes/print-mode.d.ts +4 -4
  159. package/dist/modes/print-mode.d.ts.map +1 -1
  160. package/dist/modes/print-mode.js +6 -2
  161. package/dist/modes/print-mode.js.map +1 -1
  162. package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
  163. package/dist/modes/rpc/rpc-client.js +1 -0
  164. package/dist/modes/rpc/rpc-client.js.map +1 -1
  165. package/dist/modes/rpc/rpc-mode.d.ts +2 -2
  166. package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
  167. package/dist/modes/rpc/rpc-mode.js +26 -15
  168. package/dist/modes/rpc/rpc-mode.js.map +1 -1
  169. package/dist/package-manager-cli.d.ts +4 -0
  170. package/dist/package-manager-cli.d.ts.map +1 -0
  171. package/dist/package-manager-cli.js +234 -0
  172. package/dist/package-manager-cli.js.map +1 -0
  173. package/dist/prompts/commands/atomic-commit.md +17 -0
  174. package/dist/prompts/commands/discuss-phase.md +15 -0
  175. package/dist/prompts/commands/execute-phase.md +14 -0
  176. package/dist/prompts/commands/fix.md +14 -0
  177. package/dist/prompts/commands/init-project.md +16 -0
  178. package/dist/prompts/commands/map-codebase.md +16 -0
  179. package/dist/prompts/commands/new-project.md +16 -0
  180. package/dist/prompts/commands/next-milestone.md +16 -0
  181. package/dist/prompts/commands/orchestrate.md +57 -0
  182. package/dist/prompts/commands/pause-work.md +13 -0
  183. package/dist/prompts/commands/plan-phase.md +15 -0
  184. package/dist/prompts/commands/progress.md +13 -0
  185. package/dist/prompts/commands/quick.md +14 -0
  186. package/dist/prompts/commands/resume-work.md +13 -0
  187. package/dist/prompts/commands/review.md +15 -0
  188. package/dist/prompts/commands/verify-work.md +15 -0
  189. package/dist/utils/paths.d.ts +7 -0
  190. package/dist/utils/paths.d.ts.map +1 -0
  191. package/dist/utils/paths.js +19 -0
  192. package/dist/utils/paths.js.map +1 -0
  193. package/docs/compaction.md +5 -3
  194. package/docs/custom-provider.md +1 -1
  195. package/docs/development.md +3 -1
  196. package/docs/extensions.md +150 -54
  197. package/docs/json.md +5 -2
  198. package/docs/keybindings.md +2 -0
  199. package/docs/models.md +55 -4
  200. package/docs/rpc.md +21 -7
  201. package/docs/sdk.md +116 -48
  202. package/docs/session.md +3 -3
  203. package/docs/settings.md +12 -0
  204. package/docs/skills.md +3 -2
  205. package/docs/tree.md +5 -2
  206. package/examples/README.md +1 -1
  207. package/examples/extensions/README.md +1 -0
  208. package/examples/extensions/antigravity-image-gen.ts +1 -1
  209. package/examples/extensions/custom-provider-gitlab-duo/index.ts +1 -1
  210. package/examples/extensions/doom-overlay/doom/build.sh +2 -2
  211. package/examples/extensions/hidden-thinking-label.ts +53 -0
  212. package/examples/extensions/overlay-qa-tests.ts +2 -2
  213. package/examples/extensions/sandbox/index.ts +8 -4
  214. package/examples/extensions/subagent/index.ts +5 -5
  215. package/examples/extensions/trigger-compact.ts +11 -1
  216. package/examples/sdk/13-session-runtime.ts +30 -12
  217. package/examples/sdk/README.md +4 -2
  218. package/package.json +7 -8
  219. package/prompts/commands/atomic-commit.md +17 -0
  220. package/prompts/commands/discuss-phase.md +15 -0
  221. package/prompts/commands/execute-phase.md +14 -0
  222. package/prompts/commands/fix.md +14 -0
  223. package/prompts/commands/init-project.md +16 -0
  224. package/prompts/commands/map-codebase.md +16 -0
  225. package/prompts/commands/new-project.md +16 -0
  226. package/prompts/commands/next-milestone.md +16 -0
  227. package/prompts/commands/orchestrate.md +57 -0
  228. package/prompts/commands/pause-work.md +13 -0
  229. package/prompts/commands/plan-phase.md +15 -0
  230. package/prompts/commands/progress.md +13 -0
  231. package/prompts/commands/quick.md +14 -0
  232. package/prompts/commands/resume-work.md +13 -0
  233. package/prompts/commands/review.md +15 -0
  234. package/prompts/commands/verify-work.md +15 -0
package/dist/main.js CHANGED
@@ -5,32 +5,34 @@
5
5
  * createAgentSession() options. The SDK does the heavy lifting.
6
6
  */
7
7
  import { resolve } from "node:path";
8
- import { modelsAreEqual, supportsXhigh } from "@draht/ai";
8
+ import { createInterface } from "node:readline";
9
+ import { modelsAreEqual, supportsMax, supportsXhigh } from "@draht/ai";
10
+ import { ProcessTerminal, setKeybindings, TUI } from "@draht/tui";
9
11
  import chalk from "chalk";
10
- import { createInterface } from "readline";
11
12
  import { parseArgs, printHelp } from "./cli/args.js";
12
- import { selectConfig } from "./cli/config-selector.js";
13
13
  import { processFileArguments } from "./cli/file-processor.js";
14
14
  import { buildInitialMessage } from "./cli/initial-message.js";
15
15
  import { listModels } from "./cli/list-models.js";
16
16
  import { selectSession } from "./cli/session-picker.js";
17
- import { APP_NAME, getAgentDir, getModelsPath, VERSION } from "./config.js";
18
- import { AgentSessionRuntimeHost, createAgentSessionRuntime, } from "./core/agent-session-runtime.js";
17
+ import { getAgentDir, getModelsPath, VERSION } from "./config.js";
18
+ import { createAgentSessionRuntime } from "./core/agent-session-runtime.js";
19
+ import { createAgentSessionFromServices, createAgentSessionServices, } from "./core/agent-session-services.js";
19
20
  import { AuthStorage } from "./core/auth-storage.js";
20
21
  import { exportFromFile } from "./core/export-html/index.js";
21
- import { migrateKeybindingsConfigFile } from "./core/keybindings.js";
22
- import { ModelRegistry } from "./core/model-registry.js";
22
+ import { KeybindingsManager } from "./core/keybindings.js";
23
23
  import { resolveCliModel, resolveModelScope } from "./core/model-resolver.js";
24
24
  import { restoreStdout, takeOverStdout } from "./core/output-guard.js";
25
- import { DefaultPackageManager } from "./core/package-manager.js";
26
- import { DefaultResourceLoader } from "./core/resource-loader.js";
25
+ import { formatMissingSessionCwdPrompt, getMissingSessionCwdIssue, MissingSessionCwdError, } from "./core/session-cwd.js";
27
26
  import { SessionManager } from "./core/session-manager.js";
28
27
  import { SettingsManager } from "./core/settings-manager.js";
29
- import { printTimings, time } from "./core/timings.js";
28
+ import { printTimings, resetTimings, time } from "./core/timings.js";
30
29
  import { allTools } from "./core/tools/index.js";
31
30
  import { runMigrations, showDeprecationWarnings } from "./migrations.js";
32
31
  import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index.js";
32
+ import { ExtensionSelectorComponent } from "./modes/interactive/components/extension-selector.js";
33
33
  import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.js";
34
+ import { handleConfigCommand, handlePackageCommand } from "./package-manager-cli.js";
35
+ import { isLocalPath } from "./utils/paths.js";
34
36
  /**
35
37
  * Read all content from piped stdin.
36
38
  * Returns undefined if stdin is a TTY (interactive terminal).
@@ -52,13 +54,17 @@ async function readPipedStdin() {
52
54
  process.stdin.resume();
53
55
  });
54
56
  }
55
- function reportSettingsErrors(settingsManager, context) {
56
- const errors = settingsManager.drainErrors();
57
- for (const { scope, error } of errors) {
58
- console.error(chalk.yellow(`Warning (${context}, ${scope} settings): ${error.message}`));
59
- if (error.stack) {
60
- console.error(chalk.dim(error.stack));
61
- }
57
+ function collectSettingsDiagnostics(settingsManager, context) {
58
+ return settingsManager.drainErrors().map(({ scope, error }) => ({
59
+ type: "warning",
60
+ message: `(${context}, ${scope} settings) ${error.message}`,
61
+ }));
62
+ }
63
+ function reportDiagnostics(diagnostics) {
64
+ for (const diagnostic of diagnostics) {
65
+ const color = diagnostic.type === "error" ? chalk.red : diagnostic.type === "warning" ? chalk.yellow : chalk.dim;
66
+ const prefix = diagnostic.type === "error" ? "Error: " : diagnostic.type === "warning" ? "Warning: " : "";
67
+ console.error(color(`${prefix}${diagnostic.message}`));
62
68
  }
63
69
  }
64
70
  function isTruthyEnvFlag(value) {
@@ -66,212 +72,20 @@ function isTruthyEnvFlag(value) {
66
72
  return false;
67
73
  return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
68
74
  }
69
- function getPackageCommandUsage(command) {
70
- switch (command) {
71
- case "install":
72
- return `${APP_NAME} install <source> [-l]`;
73
- case "remove":
74
- return `${APP_NAME} remove <source> [-l]`;
75
- case "update":
76
- return `${APP_NAME} update [source]`;
77
- case "list":
78
- return `${APP_NAME} list`;
79
- }
80
- }
81
- function printPackageCommandHelp(command) {
82
- switch (command) {
83
- case "install":
84
- console.log(`${chalk.bold("Usage:")}
85
- ${getPackageCommandUsage("install")}
86
-
87
- Install a package and add it to settings.
88
-
89
- Options:
90
- -l, --local Install project-locally (.pi/settings.json)
91
-
92
- Examples:
93
- ${APP_NAME} install npm:@foo/bar
94
- ${APP_NAME} install git:github.com/user/repo
95
- ${APP_NAME} install git:git@github.com:user/repo
96
- ${APP_NAME} install https://github.com/user/repo
97
- ${APP_NAME} install ssh://git@github.com/user/repo
98
- ${APP_NAME} install ./local/path
99
- `);
100
- return;
101
- case "remove":
102
- console.log(`${chalk.bold("Usage:")}
103
- ${getPackageCommandUsage("remove")}
104
-
105
- Remove a package and its source from settings.
106
- Alias: ${APP_NAME} uninstall <source> [-l]
107
-
108
- Options:
109
- -l, --local Remove from project settings (.pi/settings.json)
110
-
111
- Examples:
112
- ${APP_NAME} remove npm:@foo/bar
113
- ${APP_NAME} uninstall npm:@foo/bar
114
- `);
115
- return;
116
- case "update":
117
- console.log(`${chalk.bold("Usage:")}
118
- ${getPackageCommandUsage("update")}
119
-
120
- Update installed packages.
121
- If <source> is provided, only that package is updated.
122
- `);
123
- return;
124
- case "list":
125
- console.log(`${chalk.bold("Usage:")}
126
- ${getPackageCommandUsage("list")}
127
-
128
- List installed packages from user and project settings.
129
- `);
130
- return;
131
- }
132
- }
133
- function parsePackageCommand(args) {
134
- const [rawCommand, ...rest] = args;
135
- let command;
136
- if (rawCommand === "uninstall") {
137
- command = "remove";
75
+ function resolveAppMode(parsed, stdinIsTTY) {
76
+ if (parsed.mode === "rpc") {
77
+ return "rpc";
138
78
  }
139
- else if (rawCommand === "install" || rawCommand === "remove" || rawCommand === "update" || rawCommand === "list") {
140
- command = rawCommand;
79
+ if (parsed.mode === "json") {
80
+ return "json";
141
81
  }
142
- if (!command) {
143
- return undefined;
144
- }
145
- let local = false;
146
- let help = false;
147
- let invalidOption;
148
- let source;
149
- for (const arg of rest) {
150
- if (arg === "-h" || arg === "--help") {
151
- help = true;
152
- continue;
153
- }
154
- if (arg === "-l" || arg === "--local") {
155
- if (command === "install" || command === "remove") {
156
- local = true;
157
- }
158
- else {
159
- invalidOption = invalidOption ?? arg;
160
- }
161
- continue;
162
- }
163
- if (arg.startsWith("-")) {
164
- invalidOption = invalidOption ?? arg;
165
- continue;
166
- }
167
- if (!source) {
168
- source = arg;
169
- }
82
+ if (parsed.print || !stdinIsTTY) {
83
+ return "print";
170
84
  }
171
- return { command, source, local, help, invalidOption };
85
+ return "interactive";
172
86
  }
173
- async function handlePackageCommand(args) {
174
- const options = parsePackageCommand(args);
175
- if (!options) {
176
- return false;
177
- }
178
- if (options.help) {
179
- printPackageCommandHelp(options.command);
180
- return true;
181
- }
182
- if (options.invalidOption) {
183
- console.error(chalk.red(`Unknown option ${options.invalidOption} for "${options.command}".`));
184
- console.error(chalk.dim(`Use "${APP_NAME} --help" or "${getPackageCommandUsage(options.command)}".`));
185
- process.exitCode = 1;
186
- return true;
187
- }
188
- const source = options.source;
189
- if ((options.command === "install" || options.command === "remove") && !source) {
190
- console.error(chalk.red(`Missing ${options.command} source.`));
191
- console.error(chalk.dim(`Usage: ${getPackageCommandUsage(options.command)}`));
192
- process.exitCode = 1;
193
- return true;
194
- }
195
- const cwd = process.cwd();
196
- const agentDir = getAgentDir();
197
- const settingsManager = SettingsManager.create(cwd, agentDir);
198
- reportSettingsErrors(settingsManager, "package command");
199
- const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
200
- packageManager.setProgressCallback((event) => {
201
- if (event.type === "start") {
202
- process.stdout.write(chalk.dim(`${event.message}\n`));
203
- }
204
- });
205
- try {
206
- switch (options.command) {
207
- case "install":
208
- await packageManager.install(source, { local: options.local });
209
- packageManager.addSourceToSettings(source, { local: options.local });
210
- console.log(chalk.green(`Installed ${source}`));
211
- return true;
212
- case "remove": {
213
- await packageManager.remove(source, { local: options.local });
214
- const removed = packageManager.removeSourceFromSettings(source, { local: options.local });
215
- if (!removed) {
216
- console.error(chalk.red(`No matching package found for ${source}`));
217
- process.exitCode = 1;
218
- return true;
219
- }
220
- console.log(chalk.green(`Removed ${source}`));
221
- return true;
222
- }
223
- case "list": {
224
- const globalSettings = settingsManager.getGlobalSettings();
225
- const projectSettings = settingsManager.getProjectSettings();
226
- const globalPackages = globalSettings.packages ?? [];
227
- const projectPackages = projectSettings.packages ?? [];
228
- if (globalPackages.length === 0 && projectPackages.length === 0) {
229
- console.log(chalk.dim("No packages installed."));
230
- return true;
231
- }
232
- const formatPackage = (pkg, scope) => {
233
- const source = typeof pkg === "string" ? pkg : pkg.source;
234
- const filtered = typeof pkg === "object";
235
- const display = filtered ? `${source} (filtered)` : source;
236
- console.log(` ${display}`);
237
- const path = packageManager.getInstalledPath(source, scope);
238
- if (path) {
239
- console.log(chalk.dim(` ${path}`));
240
- }
241
- };
242
- if (globalPackages.length > 0) {
243
- console.log(chalk.bold("User packages:"));
244
- for (const pkg of globalPackages) {
245
- formatPackage(pkg, "user");
246
- }
247
- }
248
- if (projectPackages.length > 0) {
249
- if (globalPackages.length > 0)
250
- console.log();
251
- console.log(chalk.bold("Project packages:"));
252
- for (const pkg of projectPackages) {
253
- formatPackage(pkg, "project");
254
- }
255
- }
256
- return true;
257
- }
258
- case "update":
259
- await packageManager.update(source);
260
- if (source) {
261
- console.log(chalk.green(`Updated ${source}`));
262
- }
263
- else {
264
- console.log(chalk.green("Updated packages"));
265
- }
266
- return true;
267
- }
268
- }
269
- catch (error) {
270
- const message = error instanceof Error ? error.message : "Unknown package command error";
271
- console.error(chalk.red(`Error: ${message}`));
272
- process.exitCode = 1;
273
- return true;
274
- }
87
+ function toPrintOutputMode(appMode) {
88
+ return appMode === "json" ? "json" : "text";
275
89
  }
276
90
  async function prepareInitialMessage(parsed, autoResizeImages, stdinContent) {
277
91
  if (parsed.fileArgs.length === 0) {
@@ -323,29 +137,6 @@ async function promptConfirm(message) {
323
137
  });
324
138
  });
325
139
  }
326
- /** Helper to call CLI-only session_directory handlers before the initial session manager is created */
327
- async function callSessionDirectoryHook(extensions, cwd) {
328
- let customSessionDir;
329
- for (const ext of extensions.extensions) {
330
- const handlers = ext.handlers.get("session_directory");
331
- if (!handlers || handlers.length === 0)
332
- continue;
333
- for (const handler of handlers) {
334
- try {
335
- const event = { type: "session_directory", cwd };
336
- const result = (await handler(event));
337
- if (result?.sessionDir) {
338
- customSessionDir = result.sessionDir;
339
- }
340
- }
341
- catch (err) {
342
- const message = err instanceof Error ? err.message : String(err);
343
- console.error(chalk.red(`Extension "${ext.path}" session_directory handler failed: ${message}`));
344
- }
345
- }
346
- }
347
- return customSessionDir;
348
- }
349
140
  function validateForkFlags(parsed) {
350
141
  if (!parsed.fork)
351
142
  return;
@@ -370,65 +161,65 @@ function forkSessionOrExit(sourcePath, cwd, sessionDir) {
370
161
  process.exit(1);
371
162
  }
372
163
  }
373
- async function createSessionManager(parsed, cwd, extensions) {
164
+ async function createSessionManager(parsed, cwd, sessionDir, settingsManager) {
374
165
  if (parsed.noSession) {
375
166
  return SessionManager.inMemory();
376
167
  }
377
- // CLI flag takes precedence, otherwise ask extensions for custom session directory
378
- let effectiveSessionDir = parsed.sessionDir;
379
- if (!effectiveSessionDir) {
380
- effectiveSessionDir = await callSessionDirectoryHook(extensions, cwd);
381
- }
382
168
  if (parsed.fork) {
383
- const resolved = await resolveSessionPath(parsed.fork, cwd, effectiveSessionDir);
169
+ const resolved = await resolveSessionPath(parsed.fork, cwd, sessionDir);
384
170
  switch (resolved.type) {
385
171
  case "path":
386
172
  case "local":
387
173
  case "global":
388
- return forkSessionOrExit(resolved.path, cwd, effectiveSessionDir);
174
+ return forkSessionOrExit(resolved.path, cwd, sessionDir);
389
175
  case "not_found":
390
176
  console.error(chalk.red(`No session found matching '${resolved.arg}'`));
391
177
  process.exit(1);
392
178
  }
393
179
  }
394
180
  if (parsed.session) {
395
- const resolved = await resolveSessionPath(parsed.session, cwd, effectiveSessionDir);
181
+ const resolved = await resolveSessionPath(parsed.session, cwd, sessionDir);
396
182
  switch (resolved.type) {
397
183
  case "path":
398
184
  case "local":
399
- return SessionManager.open(resolved.path, effectiveSessionDir);
185
+ return SessionManager.open(resolved.path, sessionDir);
400
186
  case "global": {
401
- // Session found in different project - ask user if they want to fork
402
187
  console.log(chalk.yellow(`Session found in different project: ${resolved.cwd}`));
403
188
  const shouldFork = await promptConfirm("Fork this session into current directory?");
404
189
  if (!shouldFork) {
405
190
  console.log(chalk.dim("Aborted."));
406
191
  process.exit(0);
407
192
  }
408
- return forkSessionOrExit(resolved.path, cwd, effectiveSessionDir);
193
+ return forkSessionOrExit(resolved.path, cwd, sessionDir);
409
194
  }
410
195
  case "not_found":
411
196
  console.error(chalk.red(`No session found matching '${resolved.arg}'`));
412
197
  process.exit(1);
413
198
  }
414
199
  }
415
- if (parsed.continue) {
416
- return SessionManager.continueRecent(cwd, effectiveSessionDir);
200
+ if (parsed.resume) {
201
+ initTheme(settingsManager.getTheme(), true);
202
+ try {
203
+ const selectedPath = await selectSession((onProgress) => SessionManager.list(cwd, sessionDir, onProgress), SessionManager.listAll);
204
+ if (!selectedPath) {
205
+ console.log(chalk.dim("No session selected"));
206
+ process.exit(0);
207
+ }
208
+ return SessionManager.open(selectedPath, sessionDir);
209
+ }
210
+ finally {
211
+ stopThemeWatcher();
212
+ }
417
213
  }
418
- // --resume is handled separately (needs picker UI)
419
- // If effective session dir is set, create new session there
420
- if (effectiveSessionDir) {
421
- return SessionManager.create(cwd, effectiveSessionDir);
214
+ if (parsed.continue) {
215
+ return SessionManager.continueRecent(cwd, sessionDir);
422
216
  }
423
- // Default case (new session) returns undefined, SDK will create one
424
- return undefined;
217
+ return SessionManager.create(cwd, sessionDir);
425
218
  }
426
- function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager) {
219
+ function buildSessionOptions(parsed, scopedModels, hasExistingSession, modelRegistry, settingsManager) {
427
220
  const options = {};
221
+ const diagnostics = [];
428
222
  let cliThinkingFromModel = false;
429
- if (sessionManager) {
430
- options.sessionManager = sessionManager;
431
- }
432
223
  // Model from CLI
433
224
  // - supports --provider <name> --model <pattern>
434
225
  // - supports --model <provider>/<pattern>
@@ -439,11 +230,10 @@ function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry
439
230
  modelRegistry,
440
231
  });
441
232
  if (resolved.warning) {
442
- console.warn(chalk.yellow(`Warning: ${resolved.warning}`));
233
+ diagnostics.push({ type: "warning", message: resolved.warning });
443
234
  }
444
235
  if (resolved.error) {
445
- console.error(chalk.red(resolved.error));
446
- process.exit(1);
236
+ diagnostics.push({ type: "error", message: resolved.error });
447
237
  }
448
238
  if (resolved.model) {
449
239
  options.model = resolved.model;
@@ -455,7 +245,7 @@ function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry
455
245
  }
456
246
  }
457
247
  }
458
- if (!options.model && scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
248
+ if (!options.model && scopedModels.length > 0 && !hasExistingSession) {
459
249
  // Check if saved default is in scoped models - use it if so, otherwise first scoped model
460
250
  const savedProvider = settingsManager.getDefaultProvider();
461
251
  const savedModelId = settingsManager.getDefaultModel();
@@ -505,53 +295,34 @@ function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry
505
295
  else if (parsed.tools) {
506
296
  options.tools = parsed.tools.map((name) => allTools[name]);
507
297
  }
508
- return { options, cliThinkingFromModel };
298
+ return { options, cliThinkingFromModel, diagnostics };
509
299
  }
510
300
  function resolveCliPaths(cwd, paths) {
511
- return paths?.map((value) => resolve(cwd, value));
301
+ return paths?.map((value) => (isLocalPath(value) ? resolve(cwd, value) : value));
512
302
  }
513
- function buildRuntimeBootstrap(parsed, cwd, agentDir, authStorage, sessionOptions) {
514
- return {
515
- agentDir,
516
- authStorage,
517
- model: sessionOptions.model,
518
- thinkingLevel: sessionOptions.thinkingLevel,
519
- scopedModels: sessionOptions.scopedModels,
520
- tools: sessionOptions.tools,
521
- customTools: sessionOptions.customTools,
522
- resourceLoader: {
523
- additionalExtensionPaths: resolveCliPaths(cwd, parsed.extensions),
524
- additionalSkillPaths: resolveCliPaths(cwd, parsed.skills),
525
- additionalPromptTemplatePaths: resolveCliPaths(cwd, parsed.promptTemplates),
526
- additionalThemePaths: resolveCliPaths(cwd, parsed.themes),
527
- noExtensions: parsed.noExtensions,
528
- noSkills: parsed.noSkills,
529
- noPromptTemplates: parsed.noPromptTemplates,
530
- noThemes: parsed.noThemes,
531
- systemPrompt: parsed.systemPrompt,
532
- appendSystemPrompt: parsed.appendSystemPrompt,
533
- },
534
- };
535
- }
536
- async function handleConfigCommand(args) {
537
- if (args[0] !== "config") {
538
- return false;
539
- }
540
- const cwd = process.cwd();
541
- const agentDir = getAgentDir();
542
- const settingsManager = SettingsManager.create(cwd, agentDir);
543
- reportSettingsErrors(settingsManager, "config command");
544
- const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
545
- const resolvedPaths = await packageManager.resolve();
546
- await selectConfig({
547
- resolvedPaths,
548
- settingsManager,
549
- cwd,
550
- agentDir,
303
+ async function promptForMissingSessionCwd(issue, settingsManager) {
304
+ initTheme(settingsManager.getTheme());
305
+ setKeybindings(KeybindingsManager.create());
306
+ return new Promise((resolve) => {
307
+ const ui = new TUI(new ProcessTerminal(), settingsManager.getShowHardwareCursor());
308
+ ui.setClearOnShrink(settingsManager.getClearOnShrink());
309
+ let settled = false;
310
+ const finish = (result) => {
311
+ if (settled) {
312
+ return;
313
+ }
314
+ settled = true;
315
+ ui.stop();
316
+ resolve(result);
317
+ };
318
+ const selector = new ExtensionSelectorComponent(formatMissingSessionCwdPrompt(issue), ["Continue", "Cancel"], (option) => finish(option === "Continue" ? issue.fallbackCwd : undefined), () => finish(undefined), { tui: ui });
319
+ ui.addChild(selector);
320
+ ui.setFocus(selector);
321
+ ui.start();
551
322
  });
552
- process.exit(0);
553
323
  }
554
324
  export async function main(args) {
325
+ resetTimings();
555
326
  const offlineMode = args.includes("--offline") || isTruthyEnvFlag(process.env.PI_OFFLINE);
556
327
  if (offlineMode) {
557
328
  process.env.PI_OFFLINE = "1";
@@ -563,88 +334,26 @@ export async function main(args) {
563
334
  if (await handleConfigCommand(args)) {
564
335
  return;
565
336
  }
566
- // First pass: parse args to get --extension paths
567
- const firstPass = parseArgs(args);
568
- const shouldTakeOverStdout = firstPass.mode !== undefined || firstPass.print || !process.stdin.isTTY;
569
- if (shouldTakeOverStdout) {
570
- takeOverStdout();
571
- }
572
- // Run migrations (pass cwd for project-local migrations)
573
- const { migratedAuthProviders: migratedProviders, deprecationWarnings } = runMigrations(process.cwd());
574
- // Early load extensions to discover their CLI flags
575
- const cwd = process.cwd();
576
- const agentDir = getAgentDir();
577
- const settingsManager = SettingsManager.create(cwd, agentDir);
578
- reportSettingsErrors(settingsManager, "startup");
579
- const authStorage = AuthStorage.create();
580
- const modelRegistry = ModelRegistry.create(authStorage, getModelsPath());
581
- const resourceLoader = new DefaultResourceLoader({
582
- cwd,
583
- agentDir,
584
- settingsManager,
585
- additionalExtensionPaths: firstPass.extensions,
586
- additionalSkillPaths: firstPass.skills,
587
- additionalPromptTemplatePaths: firstPass.promptTemplates,
588
- additionalThemePaths: firstPass.themes,
589
- noExtensions: firstPass.noExtensions,
590
- noSkills: firstPass.noSkills,
591
- noPromptTemplates: firstPass.noPromptTemplates,
592
- noThemes: firstPass.noThemes,
593
- systemPrompt: firstPass.systemPrompt,
594
- appendSystemPrompt: firstPass.appendSystemPrompt,
595
- });
596
- await resourceLoader.reload();
597
- time("resourceLoader.reload");
598
- const extensionsResult = resourceLoader.getExtensions();
599
- for (const { path, error } of extensionsResult.errors) {
600
- console.error(chalk.red(`Failed to load extension "${path}": ${error}`));
601
- }
602
- // Apply pending provider registrations from extensions immediately
603
- // so they're available for model resolution before AgentSession is created
604
- for (const { name, config, extensionPath } of extensionsResult.runtime.pendingProviderRegistrations) {
605
- try {
606
- modelRegistry.registerProvider(name, config);
337
+ const parsed = parseArgs(args);
338
+ if (parsed.diagnostics.length > 0) {
339
+ for (const d of parsed.diagnostics) {
340
+ const color = d.type === "error" ? chalk.red : chalk.yellow;
341
+ console.error(color(`${d.type === "error" ? "Error" : "Warning"}: ${d.message}`));
607
342
  }
608
- catch (error) {
609
- const message = error instanceof Error ? error.message : String(error);
610
- console.error(chalk.red(`Extension "${extensionPath}" error: ${message}`));
611
- }
612
- }
613
- extensionsResult.runtime.pendingProviderRegistrations = [];
614
- const extensionFlags = new Map();
615
- for (const ext of extensionsResult.extensions) {
616
- for (const [name, flag] of ext.flags) {
617
- extensionFlags.set(name, { type: flag.type });
343
+ if (parsed.diagnostics.some((d) => d.type === "error")) {
344
+ process.exit(1);
618
345
  }
619
346
  }
620
- // Second pass: parse args with extension flags
621
- const parsed = parseArgs(args, extensionFlags);
622
- // Pass flag values to extensions via runtime
623
- for (const [name, value] of parsed.unknownFlags) {
624
- extensionsResult.runtime.flagValues.set(name, value);
347
+ time("parseArgs");
348
+ let appMode = resolveAppMode(parsed, process.stdin.isTTY);
349
+ const shouldTakeOverStdout = appMode !== "interactive";
350
+ if (shouldTakeOverStdout) {
351
+ takeOverStdout();
625
352
  }
626
353
  if (parsed.version) {
627
354
  console.log(VERSION);
628
355
  process.exit(0);
629
356
  }
630
- if (parsed.help) {
631
- printHelp();
632
- process.exit(0);
633
- }
634
- if (parsed.listModels !== undefined) {
635
- const searchPattern = typeof parsed.listModels === "string" ? parsed.listModels : undefined;
636
- await listModels(modelRegistry, searchPattern);
637
- process.exit(0);
638
- }
639
- // Read piped stdin content (if any) - skip for RPC mode which uses stdin for JSON-RPC
640
- let stdinContent;
641
- if (parsed.mode !== "rpc") {
642
- stdinContent = await readPipedStdin();
643
- if (stdinContent !== undefined) {
644
- // Force print mode since interactive mode requires a TTY for keyboard input
645
- parsed.print = true;
646
- }
647
- }
648
357
  if (parsed.export) {
649
358
  let result;
650
359
  try {
@@ -659,91 +368,181 @@ export async function main(args) {
659
368
  console.log(`Exported to: ${result}`);
660
369
  process.exit(0);
661
370
  }
662
- migrateKeybindingsConfigFile(agentDir);
663
371
  if (parsed.mode === "rpc" && parsed.fileArgs.length > 0) {
664
372
  console.error(chalk.red("Error: @file arguments are not supported in RPC mode"));
665
373
  process.exit(1);
666
374
  }
667
375
  validateForkFlags(parsed);
668
- const { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize(), stdinContent);
669
- const isInteractive = !parsed.print && parsed.mode === undefined;
670
- const startupBenchmark = isTruthyEnvFlag(process.env.PI_STARTUP_BENCHMARK);
671
- if (startupBenchmark && !isInteractive) {
672
- console.error(chalk.red("Error: PI_STARTUP_BENCHMARK only supports interactive mode"));
673
- process.exit(1);
674
- }
675
- const mode = parsed.mode || "text";
676
- initTheme(settingsManager.getTheme(), isInteractive);
677
- // Show deprecation warnings in interactive mode
678
- if (isInteractive && deprecationWarnings.length > 0) {
679
- await showDeprecationWarnings(deprecationWarnings);
680
- }
681
- let scopedModels = [];
682
- const modelPatterns = parsed.models ?? settingsManager.getEnabledModels();
683
- if (modelPatterns && modelPatterns.length > 0) {
684
- scopedModels = await resolveModelScope(modelPatterns, modelRegistry);
685
- }
686
- // Create session manager based on CLI flags
687
- let sessionManager = await createSessionManager(parsed, cwd, extensionsResult);
688
- // Handle --resume: show session picker
689
- if (parsed.resume) {
690
- // Compute effective session dir for resume (same logic as createSessionManager)
691
- const effectiveSessionDir = parsed.sessionDir || (await callSessionDirectoryHook(extensionsResult, cwd));
692
- const selectedPath = await selectSession((onProgress) => SessionManager.list(cwd, effectiveSessionDir, onProgress), SessionManager.listAll);
693
- if (!selectedPath) {
694
- console.log(chalk.dim("No session selected"));
695
- stopThemeWatcher();
696
- process.exit(0);
376
+ // Run migrations (pass cwd for project-local migrations)
377
+ const { migratedAuthProviders: migratedProviders, deprecationWarnings } = runMigrations(process.cwd());
378
+ time("runMigrations");
379
+ const cwd = process.cwd();
380
+ const agentDir = getAgentDir();
381
+ const startupSettingsManager = SettingsManager.create(cwd, agentDir);
382
+ reportDiagnostics(collectSettingsDiagnostics(startupSettingsManager, "startup session lookup"));
383
+ // Decide the final runtime cwd before creating cwd-bound runtime services.
384
+ // --session and --resume may select a session from another project, so project-local
385
+ // settings, resources, provider registrations, and models must be resolved only after
386
+ // the target session cwd is known. The startup-cwd settings manager is used only for
387
+ // sessionDir lookup during session selection.
388
+ const sessionDir = parsed.sessionDir ?? startupSettingsManager.getSessionDir();
389
+ let sessionManager = await createSessionManager(parsed, cwd, sessionDir, startupSettingsManager);
390
+ const missingSessionCwdIssue = getMissingSessionCwdIssue(sessionManager, cwd);
391
+ if (missingSessionCwdIssue) {
392
+ if (appMode === "interactive") {
393
+ const selectedCwd = await promptForMissingSessionCwd(missingSessionCwdIssue, startupSettingsManager);
394
+ if (!selectedCwd) {
395
+ process.exit(0);
396
+ }
397
+ sessionManager = SessionManager.open(missingSessionCwdIssue.sessionFile, sessionDir, selectedCwd);
697
398
  }
698
- sessionManager = SessionManager.open(selectedPath, effectiveSessionDir);
699
- }
700
- const { options: sessionOptions, cliThinkingFromModel } = buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager);
701
- if (parsed.apiKey) {
702
- if (!sessionOptions.model) {
703
- console.error(chalk.red("--api-key requires a model to be specified via --model, --provider/--model, or --models"));
399
+ else {
400
+ console.error(chalk.red(new MissingSessionCwdError(missingSessionCwdIssue).message));
704
401
  process.exit(1);
705
402
  }
706
- authStorage.setRuntimeApiKey(sessionOptions.model.provider, parsed.apiKey);
707
403
  }
708
- const runtimeBootstrap = buildRuntimeBootstrap(parsed, cwd, agentDir, authStorage, sessionOptions);
709
- const runtime = await createAgentSessionRuntime(runtimeBootstrap, {
710
- cwd: sessionManager?.getCwd() ?? cwd,
404
+ time("createSessionManager");
405
+ const resolvedExtensionPaths = resolveCliPaths(cwd, parsed.extensions);
406
+ const resolvedSkillPaths = resolveCliPaths(cwd, parsed.skills);
407
+ const resolvedPromptTemplatePaths = resolveCliPaths(cwd, parsed.promptTemplates);
408
+ const resolvedThemePaths = resolveCliPaths(cwd, parsed.themes);
409
+ const authStorage = AuthStorage.create();
410
+ const createRuntime = async ({ cwd, agentDir, sessionManager, sessionStartEvent, }) => {
411
+ const services = await createAgentSessionServices({
412
+ cwd,
413
+ agentDir,
414
+ authStorage,
415
+ extensionFlagValues: parsed.unknownFlags,
416
+ resourceLoaderOptions: {
417
+ additionalExtensionPaths: resolvedExtensionPaths,
418
+ additionalSkillPaths: resolvedSkillPaths,
419
+ additionalPromptTemplatePaths: resolvedPromptTemplatePaths,
420
+ additionalThemePaths: resolvedThemePaths,
421
+ noExtensions: parsed.noExtensions,
422
+ noSkills: parsed.noSkills,
423
+ noPromptTemplates: parsed.noPromptTemplates,
424
+ noThemes: parsed.noThemes,
425
+ systemPrompt: parsed.systemPrompt,
426
+ appendSystemPrompt: parsed.appendSystemPrompt,
427
+ },
428
+ });
429
+ const { settingsManager, modelRegistry, resourceLoader } = services;
430
+ const diagnostics = [
431
+ ...services.diagnostics,
432
+ ...collectSettingsDiagnostics(settingsManager, "runtime creation"),
433
+ ...resourceLoader.getExtensions().errors.map(({ path, error }) => ({
434
+ type: "error",
435
+ message: `Failed to load extension "${path}": ${error}`,
436
+ })),
437
+ ];
438
+ const modelPatterns = parsed.models ?? settingsManager.getEnabledModels();
439
+ const scopedModels = modelPatterns && modelPatterns.length > 0 ? await resolveModelScope(modelPatterns, modelRegistry) : [];
440
+ const { options: sessionOptions, cliThinkingFromModel, diagnostics: sessionOptionDiagnostics, } = buildSessionOptions(parsed, scopedModels, sessionManager.buildSessionContext().messages.length > 0, modelRegistry, settingsManager);
441
+ diagnostics.push(...sessionOptionDiagnostics);
442
+ if (parsed.apiKey) {
443
+ if (!sessionOptions.model) {
444
+ diagnostics.push({
445
+ type: "error",
446
+ message: "--api-key requires a model to be specified via --model, --provider/--model, or --models",
447
+ });
448
+ }
449
+ else {
450
+ authStorage.setRuntimeApiKey(sessionOptions.model.provider, parsed.apiKey);
451
+ }
452
+ }
453
+ const created = await createAgentSessionFromServices({
454
+ services,
455
+ sessionManager,
456
+ sessionStartEvent,
457
+ model: sessionOptions.model,
458
+ thinkingLevel: sessionOptions.thinkingLevel,
459
+ scopedModels: sessionOptions.scopedModels,
460
+ tools: sessionOptions.tools,
461
+ customTools: sessionOptions.customTools,
462
+ });
463
+ const cliThinkingOverride = parsed.thinking !== undefined || cliThinkingFromModel;
464
+ if (created.session.model && cliThinkingOverride) {
465
+ let effectiveThinking = created.session.thinkingLevel;
466
+ if (!created.session.model.reasoning) {
467
+ effectiveThinking = "off";
468
+ }
469
+ else if (effectiveThinking === "max" && !supportsMax(created.session.model)) {
470
+ effectiveThinking = supportsXhigh(created.session.model) ? "xhigh" : "high";
471
+ }
472
+ else if (effectiveThinking === "xhigh" && !supportsXhigh(created.session.model)) {
473
+ effectiveThinking = "high";
474
+ }
475
+ if (effectiveThinking !== created.session.thinkingLevel) {
476
+ created.session.setThinkingLevel(effectiveThinking);
477
+ }
478
+ }
479
+ return {
480
+ ...created,
481
+ services,
482
+ diagnostics,
483
+ };
484
+ };
485
+ time("createRuntime");
486
+ const runtime = await createAgentSessionRuntime(createRuntime, {
487
+ cwd: sessionManager.getCwd(),
488
+ agentDir,
711
489
  sessionManager,
712
- resourceLoader,
713
490
  });
714
- if (process.cwd() !== runtime.cwd) {
715
- process.chdir(runtime.cwd);
491
+ const { services, session, modelFallbackMessage } = runtime;
492
+ const { settingsManager, modelRegistry, resourceLoader } = services;
493
+ if (parsed.help) {
494
+ const extensionFlags = resourceLoader
495
+ .getExtensions()
496
+ .extensions.flatMap((extension) => Array.from(extension.flags.values()));
497
+ printHelp(extensionFlags);
498
+ process.exit(0);
499
+ }
500
+ if (parsed.listModels !== undefined) {
501
+ const searchPattern = typeof parsed.listModels === "string" ? parsed.listModels : undefined;
502
+ await listModels(modelRegistry, searchPattern);
503
+ process.exit(0);
504
+ }
505
+ // Read piped stdin content (if any) - skip for RPC mode which uses stdin for JSON-RPC
506
+ let stdinContent;
507
+ if (appMode !== "rpc") {
508
+ stdinContent = await readPipedStdin();
509
+ if (stdinContent !== undefined && appMode === "interactive") {
510
+ appMode = "print";
511
+ }
512
+ }
513
+ time("readPipedStdin");
514
+ const { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize(), stdinContent);
515
+ time("prepareInitialMessage");
516
+ initTheme(settingsManager.getTheme(), appMode === "interactive");
517
+ time("initTheme");
518
+ // Show deprecation warnings in interactive mode
519
+ if (appMode === "interactive" && deprecationWarnings.length > 0) {
520
+ await showDeprecationWarnings(deprecationWarnings);
521
+ }
522
+ const scopedModels = [...session.scopedModels];
523
+ time("resolveModelScope");
524
+ reportDiagnostics(runtime.diagnostics);
525
+ if (runtime.diagnostics.some((diagnostic) => diagnostic.type === "error")) {
526
+ process.exit(1);
716
527
  }
717
- const runtimeHost = new AgentSessionRuntimeHost(runtimeBootstrap, runtime);
718
- const { session, modelFallbackMessage } = runtime;
719
528
  time("createAgentSession");
720
- if (!isInteractive && !session.model) {
529
+ if (appMode !== "interactive" && !session.model) {
721
530
  console.error(chalk.red("No models available."));
722
531
  console.error(chalk.yellow("\nSet an API key environment variable:"));
723
532
  console.error(" ANTHROPIC_API_KEY, OPENAI_API_KEY, GEMINI_API_KEY, etc.");
724
533
  console.error(chalk.yellow(`\nOr create ${getModelsPath()}`));
725
534
  process.exit(1);
726
535
  }
727
- // Clamp thinking level to model capabilities for CLI-provided thinking levels.
728
- // This covers both --thinking <level> and --model <pattern>:<thinking>.
729
- const cliThinkingOverride = parsed.thinking !== undefined || cliThinkingFromModel;
730
- if (session.model && cliThinkingOverride) {
731
- let effectiveThinking = session.thinkingLevel;
732
- if (!session.model.reasoning) {
733
- effectiveThinking = "off";
734
- }
735
- else if (effectiveThinking === "xhigh" && !supportsXhigh(session.model)) {
736
- effectiveThinking = "high";
737
- }
738
- if (effectiveThinking !== session.thinkingLevel) {
739
- session.setThinkingLevel(effectiveThinking);
740
- }
536
+ const startupBenchmark = isTruthyEnvFlag(process.env.PI_STARTUP_BENCHMARK);
537
+ if (startupBenchmark && appMode !== "interactive") {
538
+ console.error(chalk.red("Error: PI_STARTUP_BENCHMARK only supports interactive mode"));
539
+ process.exit(1);
741
540
  }
742
- if (mode === "rpc") {
541
+ if (appMode === "rpc") {
743
542
  printTimings();
744
- await runRpcMode(runtimeHost);
543
+ await runRpcMode(runtime);
745
544
  }
746
- else if (isInteractive) {
545
+ else if (appMode === "interactive") {
747
546
  if (scopedModels.length > 0 && (parsed.verbose || !settingsManager.getQuietStartup())) {
748
547
  const modelList = scopedModels
749
548
  .map((sm) => {
@@ -753,7 +552,7 @@ export async function main(args) {
753
552
  .join(", ");
754
553
  console.log(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
755
554
  }
756
- const interactiveMode = new InteractiveMode(runtimeHost, {
555
+ const interactiveMode = new InteractiveMode(runtime, {
757
556
  migratedProviders,
758
557
  modelFallbackMessage,
759
558
  initialMessage,
@@ -763,6 +562,8 @@ export async function main(args) {
763
562
  });
764
563
  if (startupBenchmark) {
765
564
  await interactiveMode.init();
565
+ time("interactiveMode.init");
566
+ printTimings();
766
567
  interactiveMode.stop();
767
568
  stopThemeWatcher();
768
569
  if (process.stdout.writableLength > 0) {
@@ -778,8 +579,8 @@ export async function main(args) {
778
579
  }
779
580
  else {
780
581
  printTimings();
781
- const exitCode = await runPrintMode(runtimeHost, {
782
- mode,
582
+ const exitCode = await runPrintMode(runtime, {
583
+ mode: toPrintOutputMode(appMode),
783
584
  messages: parsed.messages,
784
585
  initialMessage,
785
586
  initialImages,