@open-agent-toolkit/cli 0.1.14 → 0.1.15

package/assets/public-package-versions.json

@@ -1,6 +1,6 @@
 {
-  "cli": "0.1.14",
-  "docs-config": "0.1.14",
-  "docs-theme": "0.1.14",
-  "docs-transforms": "0.1.14"
+  "cli": "0.1.15",
+  "docs-config": "0.1.15",
+  "docs-theme": "0.1.15",
+  "docs-transforms": "0.1.15"
 }

package/assets/skills/oat-review-provide/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: oat-review-provide
-version: 1.2.0
+version: 1.2.1
 description: Use when you need an ad-hoc review outside an active OAT project lifecycle. Reviews code or artifacts without project phase state, unlike oat-project-review-provide.
 argument-hint: '[unstaged|staged|base_branch=<branch>|base_sha=<sha>|<sha1>..<sha2>|--files <path1,path2,...>] [--output <path>] [--mode auto|local|tracked|inline]'
 disable-model-invocation: true
@@ -137,7 +137,7 @@ bash .agents/skills/oat-review-provide/scripts/resolve-review-output.sh --mode a
 
 Policy:
 
-- If `.oat/repo/reviews` exists and is not gitignored, assume user wants tracked active artifacts there.
+- If `.oat/repo/reviews` exists and new review artifacts under it are not gitignored, assume user wants tracked active artifacts there.
 - Otherwise default to active local `.oat/projects/local/orphan-reviews`.
 - Do **not** write new review artifacts directly into any `archived/` directory; those are historical locations used after `oat-review-receive` processes a review.
 - If user preference is unclear, ask and recommend local-only.

package/assets/skills/oat-review-provide/scripts/resolve-review-output.sh

@@ -18,7 +18,7 @@ Policy:
 - If --output is provided, use it directly.
 - If mode=inline, no artifact file is written.
 - In auto mode:
-  - If .oat/repo/reviews exists and is NOT gitignored, use it (tracked convention).
+  - If .oat/repo/reviews exists and new review artifacts under it are NOT gitignored, use it (tracked convention).
   - Otherwise, use .oat/projects/local/orphan-reviews (local-only default).
 USAGE
 }
@@ -67,12 +67,22 @@ is_gitignored() {
   fi
 }
 
+artifact_probe_path() {
+  local output_dir="$1"
+  printf '%s/%s\n' "${output_dir%/}" "ad-hoc-review-gitignore-probe.md"
+}
+
+is_output_gitignored() {
+  local output_dir="$1"
+  is_gitignored "$(artifact_probe_path "$output_dir")"
+}
+
 # Resolve explicit output first
 if [[ -n "$OUTPUT" ]]; then
   echo "review_mode=file"
   echo "output_dir=$OUTPUT"
   echo "output_kind=custom"
-  echo "output_gitignored=$(is_gitignored "$OUTPUT")"
+  echo "output_gitignored=$(is_output_gitignored "$OUTPUT")"
   echo "reason=explicit_output"
   exit 0
 fi
@@ -93,7 +103,7 @@ if [[ "$MODE" == "tracked" ]]; then
   echo "review_mode=file"
   echo "output_dir=$TRACKED_DIR"
   echo "output_kind=tracked"
-  echo "output_gitignored=$(is_gitignored "$TRACKED_DIR")"
+  echo "output_gitignored=$(is_output_gitignored "$TRACKED_DIR")"
   echo "reason=forced_tracked"
   exit 0
 fi
@@ -102,13 +112,13 @@ if [[ "$MODE" == "local" ]]; then
   echo "review_mode=file"
   echo "output_dir=$LOCAL_DIR"
   echo "output_kind=local"
-  echo "output_gitignored=$(is_gitignored "$LOCAL_DIR")"
+  echo "output_gitignored=$(is_output_gitignored "$LOCAL_DIR")"
   echo "reason=forced_local"
   exit 0
 fi
 
 # auto mode
-if [[ -d "$TRACKED_DIR" ]] && [[ "$(is_gitignored "$TRACKED_DIR")" == "false" ]]; then
+if [[ -d "$TRACKED_DIR" ]] && [[ "$(is_output_gitignored "$TRACKED_DIR")" == "false" ]]; then
   echo "review_mode=file"
   echo "output_dir=$TRACKED_DIR"
   echo "output_kind=tracked"
@@ -120,5 +130,5 @@ fi
 echo "review_mode=file"
 echo "output_dir=$LOCAL_DIR"
 echo "output_kind=local"
-echo "output_gitignored=$(is_gitignored "$LOCAL_DIR")"
+echo "output_gitignored=$(is_output_gitignored "$LOCAL_DIR")"
 echo "reason=default_local_only"

package/dist/commands/project/new/index.d.ts

@@ -10,6 +10,7 @@ interface ProjectNewDependencies {
         force: boolean;
         setActive: boolean;
         refreshDashboard: boolean;
+        commit: boolean;
     }) => Promise<ScaffoldProjectResult>;
 }
 export declare function createProjectNewCommand(overrides?: Partial<ProjectNewDependencies>): Command;

package/dist/commands/project/new/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AASpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;KAC3B,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AAiED,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CAiCT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAE5C,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC3B,MAAM,YAAY,CAAC;AAgBpB,UAAU,sBAAsB;IAC9B,mBAAmB,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,cAAc,CAAC;IAChE,eAAe,EAAE,CAAC,OAAO,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,mBAAmB,CAAC;QAC1B,KAAK,EAAE,OAAO,CAAC;QACf,SAAS,EAAE,OAAO,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC;KACjB,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACtC;AAoFD,wBAAgB,uBAAuB,CACrC,SAAS,GAAE,OAAO,CAAC,sBAAsB,CAAM,GAC9C,OAAO,CAkCT"}

package/dist/commands/project/new/index.js

@@ -2,6 +2,11 @@ import { buildCommandContext, } from '../../../app/command-context.js';
 import { readGlobalOptions } from '../../shared/shared.utils.js';
 import { Command, Option } from 'commander';
 import { scaffoldProject as defaultScaffoldProject, } from './scaffold.js';
+const COMMIT_STATUS_MESSAGES = {
+    skipped_disabled: 'Scaffold commit: skipped (--no-commit)',
+    skipped_no_worktree: 'Scaffold commit: skipped (not a git work tree)',
+    skipped_nothing: 'Scaffold commit: skipped (nothing to commit)',
+};
 const DEFAULT_DEPENDENCIES = {
     buildCommandContext,
     scaffoldProject: defaultScaffoldProject,
@@ -18,6 +23,10 @@ function reportSuccess(context, projectName, result) {
             skippedFiles: result.skippedFiles,
             activePointerUpdated: result.activePointerUpdated,
             dashboardRefreshed: result.dashboardRefreshed,
+            committed: result.committed,
+            commitSha: result.commitSha,
+            commitStatus: result.commitStatus,
+            commitError: result.commitError,
         });
         return;
     }
@@ -26,6 +35,18 @@ function reportSuccess(context, projectName, result) {
     if (result.activePointerUpdated) {
         context.logger.info('Active project updated in local config: .oat/config.local.json');
     }
+    if (result.commitStatus === 'committed') {
+        context.logger.info(`Scaffold commit: ${result.commitSha?.slice(0, 7) ?? 'committed'}`);
+    }
+    else if (result.commitStatus === 'failed') {
+        // The scaffold itself succeeded, so this is a warning, not an error: do not
+        // change the process exit code. Make clear the baseline was NOT committed.
+        const detail = result.commitError ? `: ${result.commitError}` : '';
+        context.logger.warn(`Warning: scaffold commit failed${detail}. The scaffolded files were written but NOT committed.`);
+    }
+    else {
+        context.logger.info(COMMIT_STATUS_MESSAGES[result.commitStatus]);
+    }
 }
 async function runProjectNew(projectName, options, context, dependencies) {
     try {
@@ -36,6 +57,7 @@ async function runProjectNew(projectName, options, context, dependencies) {
             force: options.force,
             setActive: options.setActive,
             refreshDashboard: options.dashboard,
+            commit: options.commit,
         });
         reportSuccess(context, projectName, result);
         process.exitCode = 0;
@@ -65,6 +87,7 @@ export function createProjectNewCommand(overrides = {}) {
         .option('--force', 'Non-destructive scaffold; create missing files only')
         .option('--no-set-active', 'Do not update active project in local config')
         .option('--no-dashboard', 'Do not refresh .oat/state.md after scaffold')
+        .option('--no-commit', 'Do not git-commit the scaffolded project directory')
         .action(async (name, options, command) => {
         if (name.startsWith('-')) {
             command.help();

package/dist/commands/project/new/scaffold.d.ts

@@ -6,11 +6,24 @@ export interface ScaffoldProjectOptions {
     force?: boolean;
     setActive?: boolean;
     refreshDashboard?: boolean;
+    /**
+     * Commit the freshly scaffolded project directory so the artifact baseline is
+     * git-tracked from t=0. Opt-in (default false) so library callers that manage
+     * their own commits (e.g. the project-split flow) are unaffected; only the
+     * `oat project new` command enables it by default.
+     */
+    commit?: boolean;
     env?: NodeJS.ProcessEnv;
     today?: string;
     nowUtc?: string;
     refreshDashboardCallback?: (repoRoot: string) => void | Promise<void>;
 }
+/**
+ * Classified outcome of the scoped scaffold commit. Distinguishing the skip
+ * reasons (and `failed`) lets the CLI surface accurate, distinct messaging
+ * instead of collapsing every non-commit into a single benign "skipped" line.
+ */
+export type CommitScaffoldStatus = 'committed' | 'skipped_disabled' | 'skipped_no_worktree' | 'skipped_nothing' | 'failed';
 export interface ScaffoldProjectResult {
     mode: ProjectScaffoldMode;
     projectsRoot: string;
@@ -19,6 +32,10 @@ export interface ScaffoldProjectResult {
     skippedFiles: string[];
     activePointerUpdated: boolean;
     dashboardRefreshed: boolean;
+    committed: boolean;
+    commitSha?: string;
+    commitStatus: CommitScaffoldStatus;
+    commitError?: string;
 }
 export declare function scaffoldProject(options: ScaffoldProjectOptions): Promise<ScaffoldProjectResult>;
 //# sourceMappingURL=scaffold.d.ts.map

package/dist/commands/project/new/scaffold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAwMD,wBAAsB,eAAe,CACnC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CAqDhC"}
+{"version":3,"file":"scaffold.d.ts","sourceRoot":"","sources":["../../../../src/commands/project/new/scaffold.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,OAAO,GAAG,QAAQ,CAAC;AAErE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE;AAED;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAC5B,WAAW,GACX,kBAAkB,GAClB,qBAAqB,GACrB,iBAAiB,GACjB,QAAQ,CAAC;AAEb,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoRD,wBAAsB,eAAe,CACnC,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,qBAAqB,CAAC,CA4EhC"}

package/dist/commands/project/new/scaffold.js

@@ -1,3 +1,4 @@
+import { execFileSync } from 'node:child_process';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { resolveProjectsRoot } from '../../shared/oat-paths.js';
@@ -105,6 +106,62 @@ function applyTemplateReplacements(template, projectName, today, nowUtc, mode) {
 async function defaultRefreshDashboard(repoRoot) {
     await generateStateDashboard({ repoRoot });
 }
+/**
+ * Scoped, fail-safe commit of just the files this run created.
+ *
+ * Stages and commits only the pathspecs derived from `createdFiles` (under
+ * `projectPath`) so unrelated working-tree changes — including pre-existing
+ * dirty edits inside the same project directory on a re-run, and the
+ * `.oat/state.md` dashboard outside it — are never swept in. The returned
+ * status distinguishes a clean commit from each skip reason and from a genuine
+ * git failure; on failure the captured git stderr is surfaced via `error`. This
+ * never throws: any git error is classified as `failed`, not propagated.
+ */
+function commitScaffold(cwd, projectPath, projectName, createdFiles) {
+    const run = (args) => execFileSync('git', args, {
+        cwd,
+        encoding: 'utf8',
+        // Capture stderr instead of inheriting it so deliberate skip/failure
+        // probes (e.g. tests) do not leak raw `git fatal:` lines to the terminal.
+        stdio: ['ignore', 'pipe', 'pipe'],
+    }).trim();
+    try {
+        run(['rev-parse', '--is-inside-work-tree']);
+    }
+    catch {
+        return { status: 'skipped_no_worktree', committed: false };
+    }
+    // Only commit files this run created. Nothing created => nothing to commit,
+    // which guarantees a re-run never touches unrelated working-tree edits.
+    if (createdFiles.length === 0) {
+        return { status: 'skipped_nothing', committed: false };
+    }
+    const pathspecs = createdFiles.map((file) => join(projectPath, file));
+    try {
+        run(['add', '--', ...pathspecs]);
+        const staged = run(['diff', '--cached', '--name-only', '--', ...pathspecs]);
+        if (staged.length === 0) {
+            return { status: 'skipped_nothing', committed: false };
+        }
+        run([
+            'commit',
+            '-m',
+            `chore(oat): scaffold ${projectName}`,
+            '--',
+            ...pathspecs,
+        ]);
+        const commitSha = run(['rev-parse', 'HEAD']);
+        return { status: 'committed', committed: true, commitSha };
+    }
+    catch (error) {
+        const stderr = error && typeof error === 'object' && 'stderr' in error
+            ? error.stderr
+            : undefined;
+        const message = (stderr != null ? stderr.toString().trim() : '') ||
+            (error instanceof Error ? error.message : String(error));
+        return { status: 'failed', committed: false, error: message };
+    }
+}
 async function scaffoldModeTemplates(repoRoot, projectPath, projectName, mode, today, nowUtc) {
     const templatesDir = join(repoRoot, '.oat', 'templates');
     const createdFiles = [];
@@ -169,6 +226,19 @@ export async function scaffoldProject(options) {
             console.error(`Warning: dashboard refresh failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
+    let committed = false;
+    let commitSha;
+    let commitStatus = 'skipped_disabled';
+    let commitError;
+    if (options.commit) {
+        // `projectPath` is relative to `repoRoot`, so git must run there for the
+        // pathspecs to resolve to the scaffolded files.
+        const commitResult = commitScaffold(options.repoRoot, projectPath, options.projectName, createdFiles);
+        committed = commitResult.committed;
+        commitSha = commitResult.commitSha;
+        commitStatus = commitResult.status;
+        commitError = commitResult.error;
+    }
     return {
         mode,
         projectsRoot,
@@ -177,5 +247,9 @@ export async function scaffoldProject(options) {
         skippedFiles,
         activePointerUpdated: setActive,
         dashboardRefreshed,
+        committed,
+        commitSha,
+        commitStatus,
+        commitError,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-agent-toolkit/cli",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "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.14"
+    "@open-agent-toolkit/control-plane": "0.1.15"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",