@open-agent-toolkit/cli 0.1.34 → 0.1.36

package/dist/commands/project/validate-plan/index.js

@@ -1,15 +1,19 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { buildCommandContext } from '../../../app/command-context.js';
+import { buildCommandContext, } from '../../../app/command-context.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { Command } from 'commander';
 import { extractPhaseIdsFromPlan, parseFrontmatterFromContent, validateParallelGroups, } from './validate-plan.js';
-export function createProjectValidatePlanCommand() {
+const DEFAULT_DEPENDENCIES = {
+    buildCommandContext,
+};
+export function createProjectValidatePlanCommand(overrides = {}) {
+    const dependencies = { ...DEFAULT_DEPENDENCIES, ...overrides };
     return new Command('validate-plan')
         .description('Validate plan.md parallelism metadata against the plan phase list')
         .option('--project-path <path>', 'project directory containing plan.md', process.cwd())
         .action((options, command) => {
-        const context = buildCommandContext(readGlobalOptions(command));
+        const context = dependencies.buildCommandContext(readGlobalOptions(command));
         const planPath = join(options.projectPath, 'plan.md');
         let content;
         try {
@@ -17,13 +21,26 @@ export function createProjectValidatePlanCommand() {
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
-            context.logger.error(`Failed to read plan.md: ${message}`);
+            if (context.json) {
+                context.logger.json({ valid: false, errors: [message] });
+            }
+            else {
+                context.logger.error(`Failed to read plan.md: ${message}`);
+            }
             process.exitCode = 2;
             return;
         }
         const frontmatterResult = parseFrontmatterFromContent(content);
         if (frontmatterResult.kind === 'invalid') {
-            context.logger.error(frontmatterResult.message);
+            if (context.json) {
+                context.logger.json({
+                    valid: false,
+                    errors: [frontmatterResult.message],
+                });
+            }
+            else {
+                context.logger.error(frontmatterResult.message);
+            }
             process.exitCode = 1;
             return;
         }
@@ -31,13 +48,23 @@ export function createProjectValidatePlanCommand() {
         const phaseIds = extractPhaseIdsFromPlan(content);
         const result = validateParallelGroups(groups, phaseIds);
         if (result.valid) {
-            context.logger.success('Plan validation passed.');
+            if (context.json) {
+                context.logger.json({ valid: true });
+            }
+            else {
+                context.logger.success('Plan validation passed.');
+            }
             process.exitCode = 0;
             return;
         }
-        context.logger.error('Plan validation failed:');
-        for (const err of result.errors) {
-            context.logger.error(`  - ${err}`);
+        if (context.json) {
+            context.logger.json({ valid: false, errors: result.errors });
+        }
+        else {
+            context.logger.error('Plan validation failed:');
+            for (const err of result.errors) {
+                context.logger.error(`  - ${err}`);
+            }
         }
         process.exitCode = 1;
     });

package/dist/commands/providers/inspect/inspect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/inspect/inspect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,4BAA4B,EAC7B,MAAM,qCAAqC,CAAC;AAmB7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuLpC,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,4BAA4B,CAAM,GACpD,OAAO,CAiBT"}
+{"version":3,"file":"inspect.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/inspect/inspect.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,4BAA4B,EAC7B,MAAM,qCAAqC,CAAC;AAoB7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuLpC,wBAAgB,6BAA6B,CAC3C,SAAS,GAAE,OAAO,CAAC,4BAA4B,CAAM,GACpD,OAAO,CAiBT"}

package/dist/commands/providers/inspect/inspect.js

@@ -1,5 +1,6 @@
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { detectDrift } from '../../../drift/index.js';
 import { normalizeToPosixPath, resolveProjectRoot, resolveScopeRoot, } from '../../../fs/paths.js';
@@ -149,7 +150,7 @@ export function createProvidersInspectCommand(overrides = {}) {
         ...createDependencies(),
         ...overrides,
     };
-    return new Command('inspect')
+    return withScopeOption(new Command('inspect'))
         .description('Inspect provider details and mapping state')
         .argument('<provider>', 'Provider name')
         .action(async (providerName, _options, command) => {

package/dist/commands/providers/list/list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/list/list.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,yBAAyB,EAC1B,MAAM,qCAAqC,CAAC;AAmB7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwMpC,wBAAgB,0BAA0B,CACxC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CAcT"}
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/list/list.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,yBAAyB,EAC1B,MAAM,qCAAqC,CAAC;AAoB7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwMpC,wBAAgB,0BAA0B,CACxC,SAAS,GAAE,OAAO,CAAC,yBAAyB,CAAM,GACjD,OAAO,CAcT"}

package/dist/commands/providers/list/list.js

@@ -1,5 +1,6 @@
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { detectDrift } from '../../../drift/index.js';
 import { normalizeToPosixPath, resolveProjectRoot, resolveScopeRoot, } from '../../../fs/paths.js';
@@ -166,7 +167,7 @@ export function createProvidersListCommand(overrides = {}) {
         ...createDependencies(),
         ...overrides,
     };
-    return new Command('list')
+    return withScopeOption(new Command('list'))
         .description('List provider adapters and sync summary')
         .action(async (_options, command) => {
         const context = dependencies.buildCommandContext(readGlobalOptions(command));

package/dist/commands/providers/set/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/set/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAcpF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+JpC,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAgBT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/providers/set/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAepF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA+JpC,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAmBT"}

package/dist/commands/providers/set/index.js

@@ -1,5 +1,6 @@
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, saveSyncConfig, } from '../../../config/index.js';
 import { resolveProjectRoot } from '../../../fs/paths.js';
@@ -9,7 +10,7 @@ import { copilotAdapter } from '../../../providers/copilot/index.js';
 import { cursorAdapter } from '../../../providers/cursor/index.js';
 import { geminiAdapter } from '../../../providers/gemini/index.js';
 import { Command } from 'commander';
-const PROJECT_SCOPE_ONLY_MESSAGE = 'oat providers set currently supports only --scope project. Re-run with --scope project.';
+const PROJECT_SCOPE_ONLY_MESSAGE = 'oat providers set only supports project scope. Remove --scope or pass --scope project.';
 function parseCsvList(raw) {
     if (!raw) {
         return [];
@@ -127,7 +128,10 @@ export function createProvidersSetCommand(overrides = {}) {
         ...createDependencies(),
         ...overrides,
     };
-    return new Command('set')
+    // Default to 'project' scope: providers set only supports project scope, so
+    // a bare `oat providers set --enabled X` should succeed without requiring
+    // an explicit --scope project flag.
+    return withScopeOption(new Command('set'), 'project')
         .description('Enable or disable project providers in sync config')
         .option('--enabled <providers>', 'Comma-separated providers to enable')
         .option('--disabled <providers>', 'Comma-separated providers to disable')

package/dist/commands/remove/skill/remove-skill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-skill.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skill/remove-skill.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EACL,iBAAiB,EAElB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,KAAK,yBAAyB,EAG9B,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8BpC,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,eAAe,EAAE,CAAC;IACrC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,KACf,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;IAC3E,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,wBAAgB,oCAAoC,IAAI,uBAAuB,CAgC9E;AAgKD,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,OAAO,CAAC,CAsDlB;AAED,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwCT"}
+{"version":3,"file":"remove-skill.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skill/remove-skill.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EACL,iBAAiB,EAElB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAEL,KAAK,QAAQ,EAGd,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EACL,KAAK,yBAAyB,EAG9B,KAAK,WAAW,EAChB,KAAK,eAAe,EACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8BpC,MAAM,WAAW,uBAAuB;IACtC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,gBAAgB,EAAE,CAChB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,cAAc,KACpB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,YAAY,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,WAAW,EAAE,MAAM,eAAe,EAAE,CAAC;IACrC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,UAAU,KACf,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;IAC3E,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD;AAED,wBAAgB,oCAAoC,IAAI,uBAAuB,CAgC9E;AAgKD,wBAAsB,cAAc,CAClC,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,GACpC,OAAO,CAAC,OAAO,CAAC,CAsDlB;AAED,wBAAgB,wBAAwB,CACtC,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CAwCT"}

package/dist/commands/remove/skill/remove-skill.js

@@ -1,6 +1,7 @@
 import { rm } from 'node:fs/promises';
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, } from '../../../config/sync-config.js';
 import { dirExists, fileExists } from '../../../fs/io.js';
@@ -207,7 +208,7 @@ export function createRemoveSkillCommand(overrides = {}) {
         ...createDefaultRemoveSkillDependencies(),
         ...overrides,
     };
-    return new Command('skill')
+    return withScopeOption(new Command('skill'))
         .description('Remove a single installed skill by name')
         .argument('<name>', 'Skill name (e.g., oat-idea-scratchpad)')
         .option('--dry-run', 'Preview removal without applying')

package/dist/commands/remove/skills/remove-skills.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-skills.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skills/remove-skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAMhF,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,uBAAuB,CAAC;AAiB/B,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,cAAc,EAAE,CACd,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,KAClC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,uBAAuB,EAAE,uBAAuB,CAAC;CAClD;AAqBD,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAsFT"}
+{"version":3,"file":"remove-skills.d.ts","sourceRoot":"","sources":["../../../../src/commands/remove/skills/remove-skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAOhF,OAAO,EAEL,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,uBAAuB,CAAC;AAiB/B,UAAU,wBAAwB;IAChC,mBAAmB,EAAE,CACnB,OAAO,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,KAC1C,cAAc,CAAC;IACpB,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,cAAc,EAAE,CACd,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,uBAAuB,KAClC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,uBAAuB,EAAE,uBAAuB,CAAC;CAClD;AAqBD,wBAAgB,yBAAyB,CACvC,SAAS,GAAE,OAAO,CAAC,wBAAwB,CAAM,GAChD,OAAO,CAsFT"}

package/dist/commands/remove/skills/remove-skills.js

@@ -4,6 +4,7 @@ import { IDEA_SKILLS } from '../../init/tools/ideas/install-ideas.js';
 import { RESEARCH_SKILLS } from '../../init/tools/research/install-research.js';
 import { UTILITY_SKILLS } from '../../init/tools/utility/install-utility.js';
 import { WORKFLOW_SKILLS } from '../../init/tools/workflows/install-workflows.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { confirmAction, } from '../../shared/shared.prompts.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { Command } from 'commander';
@@ -35,7 +36,7 @@ export function createRemoveSkillsCommand(overrides = {}) {
         ...createDependencies(),
         ...overrides,
     };
-    return new Command('skills')
+    return withScopeOption(new Command('skills'))
         .description('Remove installed skills by pack')
         .requiredOption('--pack <pack>', 'Skill pack to remove (ideas|docs|workflows|utility|research)')
         .option('--dry-run', 'Preview removal without applying')

package/dist/commands/repo/pr-comments/triage-collection/triage-comments.d.ts

@@ -7,6 +7,7 @@ export interface TriageOptions {
 }
 export interface TriageDependencies {
     readJsonFile: (path: string) => Promise<CollectionChunk>;
+    fileExists: (path: string) => Promise<boolean>;
 }
 export declare const defaultTriageDependencies: TriageDependencies;
 export declare function runTriageComments(context: CommandContext, options: TriageOptions, deps?: TriageDependencies): Promise<void>;

package/dist/commands/repo/pr-comments/triage-collection/triage-comments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triage-comments.d.ts","sourceRoot":"","sources":["../../../../../src/commands/repo/pr-comments/triage-collection/triage-comments.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;CAC1D;AAED,eAAO,MAAM,yBAAyB,EAAE,kBAKvC,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,aAAa,EACtB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,IAAI,CAAC,CAsEf"}
+{"version":3,"file":"triage-comments.d.ts","sourceRoot":"","sources":["../../../../../src/commands/repo/pr-comments/triage-collection/triage-comments.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;IACzD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AAED,eAAO,MAAM,yBAAyB,EAAE,kBAMvC,CAAC;AAEF,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,aAAa,EACtB,IAAI,GAAE,kBAA8C,GACnD,OAAO,CAAC,IAAI,CAAC,CAgFf"}

package/dist/commands/repo/pr-comments/triage-collection/triage-comments.js

@@ -8,22 +8,44 @@ export const defaultTriageDependencies = {
         const content = await readFile(path, 'utf8');
         return JSON.parse(content);
     },
+    fileExists,
 };
 export async function runTriageComments(context, options, deps = defaultTriageDependencies) {
     const { logger } = context;
     const { inputDir, outputDir, month } = options;
     const inputPath = join(inputDir, `${month}.json`);
-    if (!(await fileExists(inputPath))) {
+    if (!(await deps.fileExists(inputPath))) {
         throw new CliError(`Collection file not found: ${inputPath}`);
     }
     const chunk = await deps.readJsonFile(inputPath);
     if (chunk.comments.length === 0) {
-        logger.warn(`No comments in ${month} to triage.`);
+        if (context.json) {
+            logger.json({ status: 'ok', month, total: 0, comments: [] });
+        }
+        else {
+            logger.warn(`No comments in ${month} to triage.`);
+        }
         return;
     }
+    // Non-interactive path: emit collection state without prompting.
+    // This is the code path reached when --json is set or when running
+    // outside a TTY. Interactive triage is reserved for TTY sessions only.
     if (!context.interactive) {
-        throw new CliError('Triage requires an interactive terminal. Remove --json flag or run in a TTY.');
+        if (context.json) {
+            logger.json({
+                status: 'ok',
+                month,
+                total: chunk.comments.length,
+                comments: chunk.comments,
+            });
+        }
+        else {
+            logger.info(`Collection ${month}: ${chunk.comments.length} comment(s) pending triage.`);
+            logger.info('Re-run in an interactive terminal to triage, or pass --json to retrieve the collection state.');
+        }
+        return;
     }
+    // Interactive path: prompt for each comment (TTY sessions only).
     logger.info(`Triaging ${chunk.comments.length} comments from ${month}...`);
     logger.info('For each comment, enter [k]eep or [d]iscard (default: keep).\n');
     const kept = [];
@@ -51,16 +73,6 @@ export async function runTriageComments(context, options, deps = defaultTriageDe
     const outputPath = join(outputDir, `${month}.triaged.json`);
     await writeFile(outputPath, `${JSON.stringify(outputChunk, null, 2)}\n`, 'utf8');
     logger.success(`Triage complete: kept ${kept.length}/${chunk.comments.length} comments → ${outputPath}`);
-    if (context.json) {
-        logger.json({
-            status: 'ok',
-            month,
-            total: chunk.comments.length,
-            kept: kept.length,
-            discarded: chunk.comments.length - kept.length,
-            outputPath,
-        });
-    }
 }
 function printCommentSummary(comment) {
     const lines = [

package/dist/commands/shared/scope-option.d.ts

@@ -0,0 +1,21 @@
+import type { Command } from 'commander';
+/**
+ * Adds a local `--scope <scope>` option to the given command.
+ *
+ * `--scope` is deliberately NOT a global option because only a subset of
+ * commands consume it. Attaching it here (as a per-command option) means it
+ * appears in the command's own Options section and is rejected with an
+ * "unknown option" error on commands that do not call this helper.
+ *
+ * `readGlobalOptions` uses `command.optsWithGlobals()` which merges local and
+ * parent options, so `context.scope` is populated correctly with no changes to
+ * `buildCommandContext`.
+ *
+ * @param cmd - The Commander command to add the option to.
+ * @param defaultScope - The default scope value. Defaults to `'all'` for most
+ *   commands. Use `'project'` for commands that only support project scope
+ *   (e.g. `providers set`) so bare invocations succeed without requiring an
+ *   explicit `--scope project` flag.
+ */
+export declare function withScopeOption(cmd: Command, defaultScope?: 'project' | 'user' | 'all'): Command;
+//# sourceMappingURL=scope-option.d.ts.map

package/dist/commands/shared/scope-option.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope-option.d.ts","sourceRoot":"","sources":["../../../src/commands/shared/scope-option.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,OAAO,EACZ,YAAY,GAAE,SAAS,GAAG,MAAM,GAAG,KAAa,GAC/C,OAAO,CAMT"}

package/dist/commands/shared/scope-option.js

@@ -0,0 +1,24 @@
+import { Option } from 'commander';
+/**
+ * Adds a local `--scope <scope>` option to the given command.
+ *
+ * `--scope` is deliberately NOT a global option because only a subset of
+ * commands consume it. Attaching it here (as a per-command option) means it
+ * appears in the command's own Options section and is rejected with an
+ * "unknown option" error on commands that do not call this helper.
+ *
+ * `readGlobalOptions` uses `command.optsWithGlobals()` which merges local and
+ * parent options, so `context.scope` is populated correctly with no changes to
+ * `buildCommandContext`.
+ *
+ * @param cmd - The Commander command to add the option to.
+ * @param defaultScope - The default scope value. Defaults to `'all'` for most
+ *   commands. Use `'project'` for commands that only support project scope
+ *   (e.g. `providers set`) so bare invocations succeed without requiring an
+ *   explicit `--scope project` flag.
+ */
+export function withScopeOption(cmd, defaultScope = 'all') {
+    return cmd.addOption(new Option('--scope <scope>', 'Limit execution scope')
+        .choices(['project', 'user', 'all'])
+        .default(defaultScope));
+}

package/dist/commands/status/index.d.ts.map

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

package/dist/commands/status/index.js

@@ -2,6 +2,7 @@ import { basename, join, relative } from 'node:path';
 import { buildCommandContext, } from '../../app/command-context.js';
 import { adoptStrayToCanonical, isAdoptionConflictError, } from '../shared/adopt-stray.js';
 import { detectCodexRoleStrays, regenerateCodexAfterAdoption, } from '../shared/codex-strays.js';
+import { withScopeOption } from '../shared/scope-option.js';
 import { confirmAction, selectManyWithAbort, } from '../shared/shared.prompts.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
 import { detectDrift, detectStrays, } from '../../drift/index.js';
@@ -350,7 +351,7 @@ export function createStatusCommand(overrides = {}) {
         ...DEFAULT_DEPENDENCIES,
         ...overrides,
     };
-    return new Command('status')
+    return withScopeOption(new Command('status'))
         .description('Report provider sync and drift status')
         .option('--hook', 'Emit a minimal pre-commit message: warn on managed drift, info on strays')
         .action(async (options, command) => {

package/dist/commands/sync/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAsCA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAI5C,OAAO,KAAK,EAEV,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAoTtB,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CA6BT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/index.ts"],"names":[],"mappings":"AAuCA,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAI5C,OAAO,KAAK,EAEV,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAoTtB,wBAAgB,iBAAiB,CAC/B,SAAS,GAAE,OAAO,CAAC,uBAAuB,CAAM,GAC/C,OAAO,CA6BT"}

package/dist/commands/sync/index.js

@@ -1,6 +1,7 @@
 import { join } from 'node:path';
 import { buildCommandContext } from '../../app/command-context.js';
 import { PROVIDER_CONFIG_REMEDIATION } from '../shared/messages.js';
+import { withScopeOption } from '../shared/scope-option.js';
 import { selectManyWithAbort, } from '../shared/shared.prompts.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../shared/shared.utils.js';
 import { DEFAULT_SYNC_CONFIG, loadSyncConfig, saveSyncConfig, } from '../../config/index.js';
@@ -229,7 +230,7 @@ export function createSyncCommand(overrides = {}) {
         ...defaultDependencies(),
         ...overrides,
     };
-    return new Command('sync')
+    return withScopeOption(new Command('sync'))
         .description('Sync canonical content to provider views')
         .option('--dry-run', 'Preview sync changes without applying')
         .addOption(new Option('--install-canonical <path>', 'Internal install sync filter')

package/dist/commands/tools/info/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/info/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,oBAAoB,EAG1B,MAAM,aAAa,CAAC;AA2DrB,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,oBAA0C,GACvD,OAAO,CAYT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/info/index.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,oBAAoB,EAG1B,MAAM,aAAa,CAAC;AA2DrB,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,oBAA0C,GACvD,OAAO,CAYT"}

package/dist/commands/tools/info/index.js

@@ -2,6 +2,7 @@ import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
 import { getFrontmatterBlock, getFrontmatterField, parseFrontmatterField, } from '../../shared/frontmatter.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
@@ -60,7 +61,7 @@ const defaultDependencies = {
     getToolDetail,
 };
 export function createToolsInfoCommand(dependencies = defaultDependencies) {
-    return new Command('info')
+    return withScopeOption(new Command('info'))
         .description('Show details for an installed tool')
         .argument('<name>', 'Tool name')
         .action(async (name, _opts, command) => {

package/dist/commands/tools/install/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/install/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBzC,wBAAgB,yBAAyB,CACvC,gBAAgB,GAAE,oBAA8C,EAChE,aAAa,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAClD,iBAAiB,CAAC,EAAE,MAAM,OAAO,GAChC,OAAO,CAoCT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/install/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAwBzC,wBAAgB,yBAAyB,CACvC,gBAAgB,GAAE,oBAA8C,EAChE,aAAa,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAClD,iBAAiB,CAAC,EAAE,MAAM,OAAO,GAChC,OAAO,CAqCT"}

package/dist/commands/tools/install/index.js

@@ -1,6 +1,7 @@
 import { execFile } from 'node:child_process';
 import { buildCommandContext } from '../../../app/command-context.js';
 import { consumeInitToolsRunMetadata, createInitToolsCommand, } from '../../init/tools/index.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { autoSync, } from '../../tools/shared/auto-sync.js';
 import { getInstalledCanonicalPaths as getInstallSyncCanonicalPaths } from '../../tools/shared/install-sync-context.js';
@@ -31,6 +32,7 @@ export function createToolsInstallCommand(syncDependencies = defaultSyncDependen
         ? createInitToolsCommand(initOverrides)
         : createBaseCommand();
     cmd.name('install');
+    withScopeOption(cmd);
     cmd.option('--no-sync', 'Skip auto-sync after install');
     cmd.hook('postAction', async (thisCommand, actionCommand) => {
         if (process.exitCode !== 0 && process.exitCode !== undefined)

package/dist/commands/tools/list/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/list/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,qBAAqB,EAAgB,MAAM,cAAc,CAAC;AAWxE,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,qBAA2C,GACxD,OAAO,CAQT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/list/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,KAAK,qBAAqB,EAAgB,MAAM,cAAc,CAAC;AAWxE,wBAAgB,sBAAsB,CACpC,YAAY,GAAE,qBAA2C,GACxD,OAAO,CAQT"}

package/dist/commands/tools/list/index.js

@@ -1,4 +1,5 @@
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
@@ -15,7 +16,7 @@ const defaultDependencies = {
     resolveAssetsRoot,
 };
 export function createToolsListCommand(dependencies = defaultDependencies) {
-    return new Command('list')
+    return withScopeOption(new Command('list'))
         .description('List installed tools with version and status')
         .action(async (_opts, command) => {
         const globalOptions = readGlobalOptions(command);

package/dist/commands/tools/outdated/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/outdated/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,kBAAkB,CAAC;AAW1B,wBAAgB,0BAA0B,CACxC,YAAY,GAAE,yBAA+C,GAC5D,OAAO,CAQT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/outdated/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,yBAAyB,EAE/B,MAAM,kBAAkB,CAAC;AAW1B,wBAAgB,0BAA0B,CACxC,YAAY,GAAE,yBAA+C,GAC5D,OAAO,CAQT"}

package/dist/commands/tools/outdated/index.js

@@ -1,4 +1,5 @@
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
 import { resolveAssetsRoot } from '../../../fs/assets.js';
@@ -15,7 +16,7 @@ const defaultDependencies = {
     resolveAssetsRoot,
 };
 export function createToolsOutdatedCommand(dependencies = defaultDependencies) {
-    return new Command('outdated')
+    return withScopeOption(new Command('outdated'))
         .description('Show tools with available updates')
         .action(async (_opts, command) => {
         const globalOptions = readGlobalOptions(command);

package/dist/commands/tools/remove/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/index.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AA4CxB,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CAwGT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/remove/index.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAEL,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AA4CxB,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CAwGT"}

package/dist/commands/tools/remove/index.js

@@ -1,6 +1,7 @@
 import { execFile } from 'node:child_process';
 import { rm, unlink } from 'node:fs/promises';
 import { buildCommandContext } from '../../../app/command-context.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { autoSync, } from '../../tools/shared/auto-sync.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
@@ -47,7 +48,7 @@ const VALID_PACKS = [
     'brainstorm',
 ];
 export function createToolsRemoveCommand(dependencies = defaultDependencies, syncDependencies = defaultSyncDependencies) {
-    return new Command('remove')
+    return withScopeOption(new Command('remove'))
         .description('Remove installed tools')
         .argument('[name]', 'Tool name to remove')
         .option('--pack <pack>', 'Remove all tools in a pack (core|ideas|docs|workflows|utility|project-management|research|brainstorm)')

package/dist/commands/tools/update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/update/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AAexB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GAClD,MAAM,EAAE,CAUV;AAgCD,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CA4JT;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAI7E;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAOT;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,OAAO,GACd,MAAM,CAMR"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/tools/update/index.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,EAAY,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAKvE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,uBAAuB,EAE7B,MAAM,gBAAgB,CAAC;AAexB,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAAE,EAClB,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAA;CAAE,GAClD,MAAM,EAAE,CAaV;AAgCD,wBAAgB,wBAAwB,CACtC,YAAY,GAAE,uBAA6C,EAC3D,gBAAgB,GAAE,oBAA8C,GAC/D,OAAO,CA4JT;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAI7E;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAOT;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,OAAO,GACd,MAAM,CAMR"}

package/dist/commands/tools/update/index.js

@@ -3,6 +3,7 @@ import { join } from 'node:path';
 import { buildCommandContext } from '../../../app/command-context.js';
 import { applyOatCoreGitignore } from '../../init/gitignore.js';
 import { copyDirWithStatus, copyFileWithStatus, } from '../../init/tools/shared/copy-helpers.js';
+import { withScopeOption } from '../../shared/scope-option.js';
 import { readGlobalOptions, resolveConcreteScopes, } from '../../shared/shared.utils.js';
 import { autoSync, } from '../../tools/shared/auto-sync.js';
 import { scanTools } from '../../tools/shared/scan-tools.js';
@@ -26,14 +27,17 @@ const defaultDependencies = {
     applyOatCoreGitignore,
 };
 export function buildSyncSubprocessArgs(entrypoint, execArgv, options) {
+    // `--scope` is a per-command option on `sync` (not a global flag), so it must
+    // come AFTER the `sync` subcommand token. `--cwd` remains a global flag and
+    // can precede the subcommand.
     return [
         ...execArgv,
         entrypoint,
         '--cwd',
         options.cwd,
+        'sync',
         '--scope',
         options.scope,
-        'sync',
     ];
 }
 const defaultSyncDependencies = {
@@ -62,7 +66,7 @@ const VALID_PACKS = [
     'brainstorm',
 ];
 export function createToolsUpdateCommand(dependencies = defaultDependencies, syncDependencies = defaultSyncDependencies) {
-    return new Command('update')
+    return withScopeOption(new Command('update'))
         .description('Update installed tools to bundled versions')
         .argument('[name]', 'Tool name to update')
         .option('--pack <pack>', 'Update all tools in a pack (core|ideas|docs|workflows|utility|project-management|research|brainstorm)')

package/dist/config/oat-config.js

@@ -45,7 +45,7 @@ export const BUILTIN_EXEC_TARGETS = {
     },
     'cursor-default': {
         runtime: 'cursor',
-        baseCommand: ['cursor-agent', '-p', '--force'],
+        baseCommand: ['cursor-agent', '-p'],
         hostDetectionCommand: ['sh', '-c', 'test -n "$CURSOR_AGENT"'],
         availabilityCommand: ['cursor-agent', '--version'],
         priority: 70,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-agent-toolkit/cli",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "private": false,
   "description": "Open Agent Toolkit CLI",
   "homepage": "https://github.com/voxmedia/open-agent-toolkit/tree/main/packages/cli",
@@ -34,7 +34,7 @@
     "ora": "^9.0.0",
     "yaml": "2.8.2",
     "zod": "^3.25.76",
-    "@open-agent-toolkit/control-plane": "0.1.34"
+    "@open-agent-toolkit/control-plane": "0.1.36"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",