@qduc/term2 0.37.0 → 0.38.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (100) hide show
  1. package/README.md +4 -0
  2. package/dist/agent.d.ts +1 -1
  3. package/dist/agent.d.ts.map +1 -1
  4. package/dist/agent.js +29 -64
  5. package/dist/agent.js.map +1 -1
  6. package/dist/build-info.json +3 -3
  7. package/dist/cli.js +25 -17
  8. package/dist/cli.js.map +1 -1
  9. package/dist/commands/guarded-settings-command.d.ts +1 -1
  10. package/dist/commands/guarded-settings-command.d.ts.map +1 -1
  11. package/dist/commands/guarded-settings-command.js +13 -10
  12. package/dist/commands/guarded-settings-command.js.map +1 -1
  13. package/dist/commands/mode-commands.d.ts +4 -3
  14. package/dist/commands/mode-commands.d.ts.map +1 -1
  15. package/dist/commands/mode-commands.js +15 -13
  16. package/dist/commands/mode-commands.js.map +1 -1
  17. package/dist/gateway/gateway.d.ts.map +1 -1
  18. package/dist/gateway/gateway.js +6 -3
  19. package/dist/gateway/gateway.js.map +1 -1
  20. package/dist/hooks/use-app-commands.d.ts.map +1 -1
  21. package/dist/hooks/use-app-commands.js +5 -3
  22. package/dist/hooks/use-app-commands.js.map +1 -1
  23. package/dist/hooks/use-profile-selection.d.ts +2 -2
  24. package/dist/hooks/use-profile-selection.d.ts.map +1 -1
  25. package/dist/hooks/use-profile-selection.js +1 -2
  26. package/dist/hooks/use-profile-selection.js.map +1 -1
  27. package/dist/non-interactive.d.ts +3 -0
  28. package/dist/non-interactive.d.ts.map +1 -1
  29. package/dist/non-interactive.js +23 -1
  30. package/dist/non-interactive.js.map +1 -1
  31. package/dist/prompts/bare.md +1 -1
  32. package/dist/prompts/prompt-constructor.d.ts +2 -1
  33. package/dist/prompts/prompt-constructor.d.ts.map +1 -1
  34. package/dist/prompts/prompt-constructor.js +22 -34
  35. package/dist/prompts/prompt-constructor.js.map +1 -1
  36. package/dist/prompts/prompt-constructor.ts +22 -37
  37. package/dist/prompts/prompt-profiles.d.ts +1 -3
  38. package/dist/prompts/prompt-profiles.d.ts.map +1 -1
  39. package/dist/prompts/prompt-profiles.js +2 -7
  40. package/dist/prompts/prompt-profiles.js.map +1 -1
  41. package/dist/prompts/prompt-profiles.ts +3 -8
  42. package/dist/services/conversation/conversation-persistence.d.ts +3 -1
  43. package/dist/services/conversation/conversation-persistence.d.ts.map +1 -1
  44. package/dist/services/conversation/conversation-persistence.js +5 -1
  45. package/dist/services/conversation/conversation-persistence.js.map +1 -1
  46. package/dist/services/conversation/session-browser.d.ts.map +1 -1
  47. package/dist/services/conversation/session-browser.js +11 -4
  48. package/dist/services/conversation/session-browser.js.map +1 -1
  49. package/dist/services/models/model-picker-host.d.ts +1 -1
  50. package/dist/services/models/model-picker-host.d.ts.map +1 -1
  51. package/dist/services/models/model-picker-host.js +8 -4
  52. package/dist/services/models/model-picker-host.js.map +1 -1
  53. package/dist/services/profiles/labels.d.ts.map +1 -1
  54. package/dist/services/profiles/labels.js +2 -1
  55. package/dist/services/profiles/labels.js.map +1 -1
  56. package/dist/services/profiles/legacy-adapter.d.ts +5 -1
  57. package/dist/services/profiles/legacy-adapter.d.ts.map +1 -1
  58. package/dist/services/profiles/legacy-adapter.js +11 -5
  59. package/dist/services/profiles/legacy-adapter.js.map +1 -1
  60. package/dist/services/profiles/profile-transition.js +2 -2
  61. package/dist/services/profiles/registry.d.ts.map +1 -1
  62. package/dist/services/profiles/registry.js +14 -24
  63. package/dist/services/profiles/registry.js.map +1 -1
  64. package/dist/services/profiles/resolver.d.ts.map +1 -1
  65. package/dist/services/profiles/resolver.js +2 -1
  66. package/dist/services/profiles/resolver.js.map +1 -1
  67. package/dist/services/queue/queue-controller.d.ts.map +1 -1
  68. package/dist/services/queue/queue-controller.js +10 -4
  69. package/dist/services/queue/queue-controller.js.map +1 -1
  70. package/dist/services/settings/settings-schema.d.ts.map +1 -1
  71. package/dist/services/settings/settings-schema.js +3 -4
  72. package/dist/services/settings/settings-schema.js.map +1 -1
  73. package/dist/services/settings/settings-service.d.ts.map +1 -1
  74. package/dist/services/settings/settings-service.js +16 -2
  75. package/dist/services/settings/settings-service.js.map +1 -1
  76. package/dist/services/settings/settings-ui-metadata.js +3 -3
  77. package/dist/services/settings/settings-ui-metadata.js.map +1 -1
  78. package/dist/services/skills/skills-service.d.ts +3 -1
  79. package/dist/services/skills/skills-service.d.ts.map +1 -1
  80. package/dist/services/skills/skills-service.js +7 -3
  81. package/dist/services/skills/skills-service.js.map +1 -1
  82. package/dist/services/tool-toggles.d.ts.map +1 -1
  83. package/dist/services/tool-toggles.js +4 -10
  84. package/dist/services/tool-toggles.js.map +1 -1
  85. package/dist/tools/session-rollover/session-rollover-tool.js +1 -1
  86. package/dist/tools/session-rollover/session-rollover-tool.js.map +1 -1
  87. package/dist/tools/system/bare-shell.d.ts +6 -3
  88. package/dist/tools/system/bare-shell.d.ts.map +1 -1
  89. package/dist/tools/system/bare-shell.js +15 -7
  90. package/dist/tools/system/bare-shell.js.map +1 -1
  91. package/dist/tools/system/run-code/run-code.d.ts +2 -0
  92. package/dist/tools/system/run-code/run-code.d.ts.map +1 -1
  93. package/dist/tools/system/run-code/run-code.js +1 -1
  94. package/dist/tools/system/run-code/run-code.js.map +1 -1
  95. package/dist/tools/system/run-code/tools-header.d.ts +3 -1
  96. package/dist/tools/system/run-code/tools-header.d.ts.map +1 -1
  97. package/dist/tools/system/run-code/tools-header.js +7 -4
  98. package/dist/tools/system/run-code/tools-header.js.map +1 -1
  99. package/package.json +4 -2
  100. package/dist/prompts/lite.md +0 -14
package/README.md CHANGED
@@ -63,6 +63,10 @@ This README tracks `main`; npm releases may lag behind it. Check `term2 --versio
63
63
  | Work over SSH | `term2 --ssh user@host --remote-dir /path/to/project` |
64
64
  | Ask a one-off question | `term2 "Explain the difference between a merge and a rebase"` |
65
65
 
66
+ Continue a saved session headlessly with `term2 --resume <session-id> "Follow-up prompt"` (or use `last` instead of an ID). Add `--fork` to keep the original session unchanged.
67
+
68
+ `--profile bare` selects the minimal-prompt profile; the former Lite options (`--lite`, `-l`, `/lite`, and `--profile lite`) now select Bare too.
69
+
66
70
  A command-line prompt runs non-interactively, with tool execution disabled by default. `--auto-approve` enables tools without interactive confirmation; use it only when you intend unattended execution. See [scripting](https://qduc.github.io/term2/using-term2/non-interactive/) and [SSH setup](https://qduc.github.io/term2/remote/ssh/).
67
71
 
68
72
  ## Approvals and sandbox
package/dist/agent.d.ts CHANGED
@@ -19,7 +19,7 @@ import type { SessionRolloverRequest, SessionRolloverRequestOutcome } from './co
19
19
  import { ToolApprovalPolicyRegistry } from './services/approval/tool-approval-policy-registry.js';
20
20
  import type { McpToolSource } from './services/mcp/mcp-tool-source.js';
21
21
  import type { DurableGoal } from './services/logging/conversation-log-events.js';
22
- export declare function getEnvInfo(settingsService: ISettingsService, executionContext?: ExecutionContext, lite?: boolean): string;
22
+ export declare function getEnvInfo(settingsService: ISettingsService, executionContext?: ExecutionContext, minimal?: boolean): string;
23
23
  export declare function getAgentsInstructions(cwd: string): string;
24
24
  export interface AgentDefinition {
25
25
  name: string;
@@ -1 +1 @@
1
- {"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
package/dist/agent.js CHANGED
@@ -20,7 +20,7 @@ import { TOOL_NAME_ASK_USER } from './tools/tool-names.js';
20
20
  import os from 'os';
21
21
  import fs from 'fs';
22
22
  import path from 'path';
23
- import { buildPromptSpec, isLiteProfile } from './prompts/prompt-constructor.js';
23
+ import { buildPromptSpec } from './prompts/prompt-constructor.js';
24
24
  import { ProfileResolutionError, resolveActiveProfile } from './services/profiles/index.js';
25
25
  import { shouldPreferPatchEditingModel } from './lib/tool-selection-policy.js';
26
26
  import { createProposeGoalToolDefinition } from './tools/agent/propose-goal.js';
@@ -38,7 +38,7 @@ import { ToolApprovalPolicyRegistry } from './services/approval/tool-approval-po
38
38
  import { createSessionRolloverToolDefinition } from './tools/session-rollover/session-rollover-tool.js';
39
39
  import { renderDurableGoalContext } from './prompts/durable-goal-context.js';
40
40
  const BASE_PROMPT_PATH = path.join(import.meta.dirname, './prompts');
41
- export function getEnvInfo(settingsService, executionContext, lite = false) {
41
+ export function getEnvInfo(settingsService, executionContext, minimal = false) {
42
42
  const isRemote = !!executionContext?.isRemote();
43
43
  // This process's own OS/shell are the controller's, not the remote host's —
44
44
  // asserting them as fact over SSH tells the model the wrong platform outright.
@@ -57,8 +57,8 @@ export function getEnvInfo(settingsService, executionContext, lite = false) {
57
57
  const hostLine = isRemote
58
58
  ? "Host: remote via SSH — OS/shell are the remote machine's, not this controller's, and are unknown here; use commands (e.g. `uname -a`) if you need them"
59
59
  : `OS: ${osType} ${osRelease} (${osPlatform}); shell: ${shellPath}`;
60
- if (lite) {
61
- // Minimal env info for lite mode
60
+ if (minimal) {
61
+ // Bare keeps the environment line short: no top-level tree
62
62
  return `${hostLine}; cwd (you're already here, don't \`cd\` to it): ${cwd}${home}; date: ${now}`;
63
63
  }
64
64
  // For remote sessions, we might not be able to list top-level entries efficiently or at all easily here synchronously
@@ -185,7 +185,6 @@ export const getAgentDefinition = (deps, model) => {
185
185
  throw new Error('orchestratorMode requires runSubagentAsync, getSubagentResult, getSubagentStatus, sendSubagentMessage, and cancelSubagentRun: cannot build orchestrator agent without asynchronous delegation.');
186
186
  }
187
187
  const bareMode = profile.identity.id === 'builtin:bare';
188
- const liteMode = isLiteProfile(profile);
189
188
  const capabilities = profile.tools.capabilities;
190
189
  // Per-group kill switches (tools.<group>.enabled): mask the resolved set so
191
190
  // every registration below consults the effective capabilities, and a
@@ -212,7 +211,7 @@ export const getAgentDefinition = (deps, model) => {
212
211
  onWarning: (message) => loggingService.warn(message),
213
212
  }).build({ kind: 'main' }, {
214
213
  projectPath: executionContext?.getCwd() ?? process.cwd(),
215
- includeContext: memoryContextEnabled && !liteMode && hasCapability('memory'),
214
+ includeContext: memoryContextEnabled && hasCapability('memory'),
216
215
  snapshotGlobalContext: deps.snapshotGlobalMemoryContext,
217
216
  });
218
217
  const promptSpec = buildPromptSpec({
@@ -231,7 +230,7 @@ export const getAgentDefinition = (deps, model) => {
231
230
  memoryContext: memoryCapability.context,
232
231
  sessionBrowserEnabled: hasCapability('sessions') && sessionBrowserContextEnabled && Boolean(sessionBrowser),
233
232
  executionContext,
234
- runCodeEnabled: !bareMode && hasCapability('shell'),
233
+ runCodeEnabled: hasCapability('shell'),
235
234
  editorSurface: filesystemWriteEnabled ? (usesPatchEditingSurface ? 'patch' : 'editors') : 'none',
236
235
  });
237
236
  let prompt = promptSpec.basePromptContent ?? resolvePrompt(path.join(BASE_PROMPT_PATH, promptSpec.basePromptFile));
@@ -247,17 +246,16 @@ export const getAgentDefinition = (deps, model) => {
247
246
  prompt = `${prompt}\n\n${inlineSection}`;
248
247
  }
249
248
  const cwd = executionContext?.getCwd() || process.cwd();
250
- const isLiteEnv = liteMode;
251
249
  // grep/glob register whenever the surface can read and search has not been
252
250
  // routed to the shell; the flag keeps the search-tool descriptions consistent
253
251
  // so the model does not call a tool that is not on its allowlist.
254
252
  const globAvailable = filesystemReadEnabled && !searchViaShell;
255
- const envInfo = environmentEnabled ? getEnvInfo(settingsService, executionContext, isLiteEnv) : '';
253
+ const envInfo = environmentEnabled ? getEnvInfo(settingsService, executionContext, bareMode) : '';
256
254
  const skipAgentsMd = !projectInstructionsEnabled || (executionContext?.isRemote() ?? false);
257
255
  const agentsInstructions = skipAgentsMd ? '' : getAgentsInstructions(cwd);
258
256
  let skillsInstructions = '';
259
257
  if (hasCapability('skills') && skillsCatalogEnabled && skillsService) {
260
- const catalog = skillsService.getSkillCatalog();
258
+ const catalog = skillsService.getSkillCatalog(bareMode ? { loadVia: 'shell' } : {});
261
259
  if (catalog) {
262
260
  skillsInstructions = `\n\n${catalog}`;
263
261
  }
@@ -280,11 +278,12 @@ export const getAgentDefinition = (deps, model) => {
280
278
  });
281
279
  const features = {
282
280
  web: hasCapability('web'),
283
- activateSkill: hasCapability('skills') && Boolean(skillsService),
281
+ // Bare loads skills by reading SKILL.md through the shell.
282
+ activateSkill: hasCapability('skills') && !bareMode && Boolean(skillsService),
284
283
  };
285
284
  const tools = [];
286
285
  if (hasCapability('shell'))
287
- tools.push(bareMode ? presentBareShell(shellTool) : shellTool);
286
+ tools.push(bareMode ? presentBareShell(shellTool, { background: Boolean(rootBackgroundShellRegistry) }) : shellTool);
288
287
  if (features.web)
289
288
  tools.push(...createWebToolDefinitions({ settingsService, loggingService }));
290
289
  if (backgroundTasksEnabled &&
@@ -364,39 +363,11 @@ export const getAgentDefinition = (deps, model) => {
364
363
  if (codeContextEnabled && hasCapability('code-context')) {
365
364
  tools.push(createReadCodeOutlineToolDefinition({ executionContext, settingsService }), createCodeContextSearchToolDefinition({ executionContext, globAvailable, settingsService }));
366
365
  }
367
- if (liteMode) {
368
- // Lite mode keeps lightweight context and delegation policy, but still allows file edits.
369
- // Keep workspace scope keyed to lite identity, not filesystem-read eligibility,
370
- // so capability resolution cannot widen standard mode's read scope.
371
- if (filesystemReadEnabled && !searchViaShell) {
372
- tools.push(createGrepToolDefinition({ executionContext, globAvailable, allowOutsideWorkspace: true, settingsService }), createFindFilesToolDefinition({
373
- executionContext,
374
- allowOutsideWorkspace: true,
375
- settingsService,
376
- }));
377
- }
378
- if (filesystemReadEnabled) {
379
- tools.push(createReadFileToolDefinition({
380
- executionContext,
381
- allowOutsideWorkspace: true,
382
- settingsService,
383
- }));
384
- }
385
- if (filesystemWriteEnabled) {
386
- if (usesPatchEditingSurface) {
387
- tools.push(createApplyPatchToolDefinition({ settingsService, loggingService, executionContext, sessionAccess }));
388
- }
389
- else {
390
- tools.push(createCreateFileToolDefinition({ settingsService, loggingService, executionContext, sessionAccess }), createSearchReplaceToolDefinition({ settingsService, loggingService, executionContext, sessionAccess }));
391
- }
392
- }
393
- }
394
- else {
395
- // Full mode: all tools based on model
366
+ {
396
367
  if (filesystemReadEnabled) {
397
368
  tools.push(createReadFileToolDefinition({ executionContext, sessionAccess, settingsService }));
398
369
  // Search is a read capability: it is gated on read plus the setting, never
399
- // on write authority or the editing surface (mirrors the lite branch).
370
+ // on write authority or the editing surface.
400
371
  if (!searchViaShell) {
401
372
  tools.push(createGrepToolDefinition({ executionContext, globAvailable, sessionAccess, settingsService }), createFindFilesToolDefinition({ executionContext, sessionAccess, settingsService }));
402
373
  }
@@ -460,15 +431,10 @@ export const getAgentDefinition = (deps, model) => {
460
431
  // Registered last so its bridge exposes every other tool this profile
461
432
  // resolved. The registry it actually calls is injected later by
462
433
  // bindRunCodeRegistry, once the policy layer has wrapped these definitions.
463
- if (!bareMode && hasCapability('shell')) {
464
- // Lite intentionally permits outside-workspace reads while its write tools
465
- // remain workspace-rooted. The current AgentSpec scope type cannot express
466
- // that mixed authority without widening writes, so fail closed for this
467
- // root until the scope contract gains independent unrestricted axes.
468
- const liteMixedFilesystemAuthority = liteMode && filesystemReadEnabled && filesystemWriteEnabled;
469
- const filesystemScope = !liteMixedFilesystemAuthority && (filesystemReadEnabled || filesystemWriteEnabled)
434
+ if (hasCapability('shell')) {
435
+ const filesystemScope = filesystemReadEnabled || filesystemWriteEnabled
470
436
  ? {
471
- read: filesystemReadEnabled && !liteMode ? ['**'] : [],
437
+ read: filesystemReadEnabled ? ['**'] : [],
472
438
  write: filesystemWriteEnabled ? ['**'] : [],
473
439
  }
474
440
  : undefined;
@@ -486,20 +452,18 @@ export const getAgentDefinition = (deps, model) => {
486
452
  })
487
453
  : undefined);
488
454
  const worktreePaths = deps.worktreePaths ?? worktreeScope?.authorizedPaths;
489
- const agentSpecAuthority = liteMixedFilesystemAuthority
490
- ? undefined
491
- : createRootAgentAuthoritySnapshot({
492
- effectiveTools: tools.map((tool) => tool.name),
493
- filesystemScope,
494
- limits: {
495
- ...(maxTurns !== undefined ? { maxTurns } : {}),
496
- ...(maxTokens !== undefined ? { maxTokens } : {}),
497
- },
498
- readOnly,
499
- planMode,
500
- ...(worktreeScope ? { worktreeScope } : {}),
501
- ...(worktreePaths ? { worktreePaths } : {}),
502
- });
455
+ const agentSpecAuthority = createRootAgentAuthoritySnapshot({
456
+ effectiveTools: tools.map((tool) => tool.name),
457
+ filesystemScope,
458
+ limits: {
459
+ ...(maxTurns !== undefined ? { maxTurns } : {}),
460
+ ...(maxTokens !== undefined ? { maxTokens } : {}),
461
+ },
462
+ readOnly,
463
+ planMode,
464
+ ...(worktreeScope ? { worktreeScope } : {}),
465
+ ...(worktreePaths ? { worktreePaths } : {}),
466
+ });
503
467
  // The script-only agent capability rides on the same root authority
504
468
  // snapshot as run_code and additionally requires the subagents capability
505
469
  // plus at least one resolved-launch seam. Raw runSubagent callbacks are
@@ -522,6 +486,7 @@ export const getAgentDefinition = (deps, model) => {
522
486
  getCwd: () => executionContext?.getCwd() || process.cwd(),
523
487
  approvalPolicyRegistry: resolvedApprovalPolicyRegistry,
524
488
  sessionAccess,
489
+ ...(bareMode ? { catalogOtherTools: 'names' } : {}),
525
490
  ...(agentSpecAuthority ? { agentSpecAuthority } : {}),
526
491
  ...(agentSpecBridge ? { agentSpecBridge } : {}),
527
492
  ...(hasCapability('mcp') && !profile.enforcement.denials.has('mcp') && mcpToolSource ? { mcpToolSource } : {}),
package/dist/agent.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"agent.js","sourceRoot":"","sources":["../source/agent.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  {
2
- "version": "0.37.0",
3
- "commit": "da1d4ad2644d1db59b1bea0becc7598c4c7d0c72",
4
- "release": true,
2
+ "version": "0.38.0-dev+808b19d",
3
+ "commit": "808b19d89ca4c93f413ed59a93d23b79817dbeaa",
4
+ "release": false,
5
5
  "limitation": null
6
6
  }
package/dist/cli.js CHANGED
@@ -29,7 +29,7 @@ import { AGENT_AFFECTING_SETTINGS } from './services/logging/conversation-log-ev
29
29
  import { installPlanModeInterceptor } from './services/plan-mode-interceptor.js';
30
30
  import { isModelPickerEligible } from './services/models/model-picker-host.js';
31
31
  import { HARNESS_IDLE_ENV } from './lib/harness-input-idle.js';
32
- import { legacyModeFromProfileId, LITE_PROFILE_ID, profileIdFromLegacyMode, } from './services/profiles/legacy-adapter.js';
32
+ import { legacyModeFromProfileId, BARE_PROFILE_ID, canonicalProfileId, profileIdFromLegacyMode, } from './services/profiles/legacy-adapter.js';
33
33
  import { createOwnedSessionClientFactory } from './services/session/session-client-factory.js';
34
34
  import os from 'os';
35
35
  import fs from 'fs';
@@ -189,6 +189,7 @@ const cli = meow(`
189
189
  $ term2 "explain this function"
190
190
  $ term2 --resume
191
191
  $ term2 --resume <conversation-id>
192
+ $ term2 --resume <conversation-id> "Follow-up prompt"
192
193
  $ term2 --help
193
194
 
194
195
  Usage
@@ -203,8 +204,8 @@ const cli = meow(`
203
204
  -r, --reasoning <effort> Set reasoning effort (default, none, minimal, low, medium, high, xhigh)
204
205
  --goal <text> Persist a user-authored session outcome (max 2,000 characters)
205
206
  --goal-criteria <text> Optional success criteria (max 2,000 characters; requires --goal)
206
- --profile <name> Select a profile (full, bare, lite, plan, pair, mentor, orchestrator)
207
- -l, --lite Start in lite mode (minimal context, session-only)
207
+ --profile <name> Select a profile (full, bare, plan, pair, mentor, orchestrator; lite = bare)
208
+ -l, --lite Start in the Bare profile (alias kept from Lite)
208
209
  --auto-approve Allow tool execution for a non-interactive prompt
209
210
  -q, --quiet Suppress non-error diagnostics on stderr in non-interactive mode
210
211
  --show-reasoning Stream reasoning deltas to stderr in non-interactive mode
@@ -269,6 +270,7 @@ const cli = meow(`
269
270
  $ term2 --json "explain this function"
270
271
  $ term2 --resume
271
272
  $ term2 --resume <conversation-id>
273
+ $ term2 --resume <conversation-id> "Follow-up prompt"
272
274
  $ term2 --resume <conversation-id> --fork
273
275
  $ term2 --resume ls
274
276
  $ term2 --grok-login
@@ -482,11 +484,11 @@ const expectedSshHost = cli.flags.ssh
482
484
  ? cli.flags.ssh.split('@')[1]
483
485
  : cli.flags.ssh
484
486
  : undefined;
485
- if (resumeRequested && cli.input.length > 1) {
486
- console.error('Error: --resume accepts at most one conversation id.');
487
- process.exit(1);
488
- }
489
487
  if (resumeRequested && (resumeTarget === 'ls' || resumeTarget === 'list')) {
488
+ if (cli.input.length > 1) {
489
+ console.error('Error: --resume ls does not accept a prompt.');
490
+ process.exit(1);
491
+ }
490
492
  const conversations = await listRecentConversations(resumeProjectPath, expectedSshHost, 10);
491
493
  const formatted = formatResumeList(conversations);
492
494
  console.log(formatted);
@@ -496,7 +498,7 @@ if (forkRequested && !resumeRequested) {
496
498
  console.error('Error: --fork can only be used with --resume.');
497
499
  process.exit(1);
498
500
  }
499
- const positionalPrompt = resumeRequested ? '' : cli.input.join(' ').trim();
501
+ const positionalPrompt = (resumeRequested ? cli.input.slice(1) : cli.input).join(' ').trim();
500
502
  const hasPositionalPrompt = positionalPrompt.length > 0;
501
503
  let launchGoal;
502
504
  try {
@@ -609,6 +611,11 @@ if (resumeRequested) {
609
611
  resumedSourceId = resumedConversation?.id;
610
612
  }
611
613
  }
614
+ if (resumeRequested && !resumedConversation) {
615
+ console.error(`No conversation found to resume (${resumeTarget ?? 'last'}).`);
616
+ console.error('Run "term2 --resume ls" to list available conversations.');
617
+ process.exit(1);
618
+ }
612
619
  // If --fork was requested, copy the source jsonl to a new id and resume from the copy.
613
620
  if (forkRequested) {
614
621
  if (!resumedSourceId || !resumedConversation) {
@@ -620,7 +627,7 @@ if (forkRequested) {
620
627
  console.error(`Error: Could not fork conversation ${resumedSourceId}.`);
621
628
  process.exit(1);
622
629
  }
623
- console.log(`Forked conversation ${resumedSourceId} → ${forkedId}`);
630
+ console.error(`Forked conversation ${resumedSourceId} → ${forkedId}`);
624
631
  resumedConversation = { ...resumedConversation, id: forkedId, forkedFrom: resumedSourceId };
625
632
  resumedSourceId = forkedId;
626
633
  }
@@ -747,28 +754,28 @@ if (modelFlag) {
747
754
  let profileId;
748
755
  if (cli.flags.profile) {
749
756
  const name = cli.flags.profile === 'full' ? 'standard' : cli.flags.profile;
750
- profileId = name.includes(':') ? name : `builtin:${name}`;
757
+ profileId = canonicalProfileId(name.includes(':') ? name : `builtin:${name}`);
751
758
  // Validate before building providers or starting a session.
752
759
  resolveProfile(profileId);
753
760
  }
754
761
  else if (resumedConversation) {
755
762
  profileId = cli.flags.lite
756
- ? LITE_PROFILE_ID
757
- : resumedConversation.activeProfileId ??
763
+ ? BARE_PROFILE_ID
764
+ : canonicalProfileId(resumedConversation.activeProfileId ??
758
765
  (resumedConversation.appMode
759
766
  ? profileIdFromLegacyMode(resumedConversation.appMode)
760
- : String(settings.get('app.activeProfileId')));
767
+ : String(settings.get('app.activeProfileId'))));
761
768
  }
762
769
  else if (cli.flags.lite) {
763
- profileId = LITE_PROFILE_ID;
770
+ profileId = BARE_PROFILE_ID;
764
771
  }
765
772
  else {
766
773
  const implicitLite = Boolean(hasPositionalPrompt && !cli.flags.autoApprove);
767
774
  const persistedProfileId = String(settings.get('app.activeProfileId'));
768
775
  // Implicit lite must not override a higher-precedence mode already persisted.
769
776
  profileId =
770
- implicitLite && !['builtin:bare', 'builtin:orchestrator', 'builtin:mentor'].includes(persistedProfileId)
771
- ? LITE_PROFILE_ID
777
+ implicitLite && !['builtin:orchestrator', 'builtin:mentor'].includes(persistedProfileId)
778
+ ? BARE_PROFILE_ID
772
779
  : persistedProfileId;
773
780
  }
774
781
  settings.set('app.activeProfileId', profileId, { persist: false });
@@ -1017,7 +1024,8 @@ if (hasPositionalPrompt) {
1017
1024
  hookLifecycle: hookService,
1018
1025
  mcpAllowlist: mcpConfig.nonInteractiveAllow,
1019
1026
  mcpToolSource: mcpManager,
1020
- initialGoal: launchGoal,
1027
+ initialGoal: launchGoal ?? resumedConversation?.goal,
1028
+ resumedConversation: resumedConversation ?? undefined,
1021
1029
  onGoalPersisted: (goal) => {
1022
1030
  currentGoalState.current = goal;
1023
1031
  },