@aviaratech/ai-delivery 0.1.0

package/dist/worktree.js

@@ -0,0 +1,255 @@
+import { existsSync, realpathSync } from 'node:fs';
+import { join, relative, resolve } from 'node:path';
+import { DeliveryError } from './errors.js';
+import { assertClean, defaultBaseRef, git, gitExitCode, gitRoot, primaryGitRoot } from './git.js';
+import { addWorktreeEntry, assertAiDeliveryWorktreeOwner, getIssueWorktreeStrict, listWorktreesStrict, removeWorktreeEntry, } from './services/worktreeRegistry.js';
+function assertSafePath(root, target) {
+    const rel = relative(join(root, '.worktrees'), target);
+    if (rel === '' || rel.startsWith('..') || rel.startsWith('/')) {
+        throw new DeliveryError('Worktree path must be inside the repository .worktrees directory.');
+    }
+}
+function assertIssueNumber(issueNumber) {
+    if (!Number.isSafeInteger(issueNumber) || issueNumber <= 0)
+        throw new DeliveryError('Issue number must be positive.');
+}
+export async function prepareIssueWorktree(input) {
+    assertIssueNumber(input.issueNumber);
+    const root = primaryGitRoot(input.repoRoot);
+    const branch = `issue/${input.issueNumber}`;
+    const target = join(root, '.worktrees', `issue-${input.issueNumber}`);
+    assertSafePath(root, target);
+    const existing = listWorktreesStrict(root).filter((row) => row.type === 'issue' && row.issueNumber === input.issueNumber);
+    if (existing.length > 1)
+        throw new DeliveryError('Issue has duplicate worktree registry rows.');
+    if (existing.length === 1) {
+        const row = existing[0];
+        assertAiDeliveryWorktreeOwner(row, root);
+        if (row.status !== 'active' && row.status !== 'pr-published') {
+            throw new DeliveryError('Only an active issue worktree can be resumed.');
+        }
+        if (row.path !== target ||
+            row.branch !== branch ||
+            !existsSync(target) ||
+            gitRoot(target) !== realpathSync(target)) {
+            throw new DeliveryError('Registered worktree disagrees with its exact path or branch.');
+        }
+        if (git(target, 'branch', '--show-current') !== branch)
+            throw new DeliveryError('Registered branch drifted.');
+        return row;
+    }
+    if (existsSync(target))
+        throw new DeliveryError('An unregistered issue worktree path already exists.');
+    const base = input.baseRef ?? defaultBaseRef(root);
+    if (!base || gitExitCode(root, 'rev-parse', '--verify', '--quiet', base) !== 0) {
+        throw new DeliveryError('Default base ref is missing.');
+    }
+    const branchExists = gitExitCode(root, 'show-ref', '--verify', '--quiet', `refs/heads/${branch}`) === 0;
+    if (branchExists) {
+        git(root, 'worktree', 'add', target, branch);
+    }
+    else {
+        git(root, 'worktree', 'add', '-b', branch, target, base);
+    }
+    const now = new Date().toISOString();
+    const row = {
+        branch,
+        createdAt: now,
+        identity: input.identity,
+        issueNumber: input.issueNumber,
+        path: target,
+        status: 'active',
+        type: 'issue',
+        updatedAt: now,
+    };
+    try {
+        await addWorktreeEntry(row, root);
+    }
+    catch (error) {
+        if (git(target, 'status', '--porcelain', '--untracked-files=all') === '') {
+            git(root, 'worktree', 'remove', target);
+        }
+        throw error;
+    }
+    return row;
+}
+export async function prepareStandaloneWorktree(input) {
+    if (!/^[a-z][a-z0-9-]{0,63}$/u.test(input.name) || !/^[A-Za-z0-9._/-]+$/u.test(input.branch)) {
+        throw new DeliveryError('Invalid standalone worktree name or branch.');
+    }
+    const root = primaryGitRoot(input.repoRoot);
+    const target = resolve(root, '.worktrees', input.name);
+    assertSafePath(root, target);
+    if (existsSync(target) ||
+        listWorktreesStrict(root).some((row) => row.path === target || row.branch === input.branch)) {
+        throw new DeliveryError('Standalone worktree name or branch already exists.');
+    }
+    const base = input.baseRef ?? defaultBaseRef(root);
+    git(root, 'worktree', 'add', '-b', input.branch, target, base);
+    const now = new Date().toISOString();
+    const row = {
+        branch: input.branch,
+        createdAt: now,
+        identity: input.identity,
+        path: target,
+        status: 'active',
+        type: 'standalone',
+        updatedAt: now,
+    };
+    try {
+        await addWorktreeEntry(row, root);
+    }
+    catch (error) {
+        assertClean(target);
+        git(root, 'worktree', 'remove', target);
+        throw error;
+    }
+    return row;
+}
+/** Register the exact head of an in-repository PR after its selected-App fetch. */
+export async function preparePrWorktree(input) {
+    assertIssueNumber(input.prNumber);
+    if (!/^[a-f0-9]{40}$/u.test(input.headSha))
+        throw new DeliveryError('PR head SHA is invalid.');
+    const root = primaryGitRoot(input.repoRoot);
+    const branch = `pr/${input.prNumber}`;
+    const target = join(root, '.worktrees', `pr-${input.prNumber}`);
+    assertSafePath(root, target);
+    if (gitExitCode(root, 'cat-file', '-e', `${input.headSha}^{commit}`) !== 0) {
+        throw new DeliveryError('Fetched PR head object is unavailable.');
+    }
+    const matches = listWorktreesStrict(root).filter((row) => row.type === 'pr' && row.prNumber === input.prNumber);
+    if (matches.length > 1)
+        throw new DeliveryError('PR has duplicate worktree registry rows.');
+    if (matches.length === 1) {
+        const row = matches[0];
+        assertAiDeliveryWorktreeOwner(row, root);
+        if (row.status !== 'active' ||
+            row.path !== target ||
+            row.branch !== branch ||
+            !existsSync(target) ||
+            gitRoot(target) !== realpathSync(target) ||
+            git(target, 'branch', '--show-current') !== branch) {
+            throw new DeliveryError('Registered PR worktree disagrees with its exact path or branch.');
+        }
+        if (git(target, 'rev-parse', 'HEAD') !== input.headSha) {
+            throw new DeliveryError('Registered PR worktree head differs from the fetched PR head.');
+        }
+        return row;
+    }
+    if (existsSync(target))
+        throw new DeliveryError('An unregistered PR worktree path already exists.');
+    const branchExists = gitExitCode(root, 'show-ref', '--verify', '--quiet', `refs/heads/${branch}`) === 0;
+    if (branchExists && git(root, 'rev-parse', `refs/heads/${branch}`) !== input.headSha) {
+        throw new DeliveryError('Retained PR branch differs from the fetched PR head.');
+    }
+    if (branchExists)
+        git(root, 'worktree', 'add', target, branch);
+    else
+        git(root, 'worktree', 'add', '-b', branch, target, input.headSha);
+    const now = new Date().toISOString();
+    const row = {
+        branch,
+        createdAt: now,
+        identity: input.identity,
+        path: target,
+        prNumber: input.prNumber,
+        status: 'active',
+        type: 'pr',
+        updatedAt: now,
+    };
+    try {
+        await addWorktreeEntry(row, root);
+    }
+    catch (error) {
+        assertClean(target);
+        git(root, 'worktree', 'remove', target);
+        throw error;
+    }
+    return row;
+}
+/** Remove only a clean registered PR or standalone worktree; issue cleanup remains receipt-bound. */
+export async function cleanupNonIssueWorktree(input) {
+    if ((input.name === undefined) === (input.prNumber === undefined)) {
+        throw new DeliveryError('Select exactly one registered PR number or standalone name.');
+    }
+    if (input.prNumber !== undefined)
+        assertIssueNumber(input.prNumber);
+    if (input.name !== undefined && !/^[a-z0-9][a-z0-9._-]*$/u.test(input.name)) {
+        throw new DeliveryError('Standalone worktree name is invalid.');
+    }
+    const root = primaryGitRoot(input.repoRoot);
+    const target = input.prNumber === undefined
+        ? join(root, '.worktrees', input.name)
+        : join(root, '.worktrees', `pr-${input.prNumber}`);
+    assertSafePath(root, target);
+    const matches = listWorktreesStrict(root).filter((row) => row.path === target);
+    if (matches.length !== 1 ||
+        (input.prNumber === undefined
+            ? matches[0].type !== 'standalone'
+            : matches[0].type !== 'pr' || matches[0].prNumber !== input.prNumber)) {
+        throw new DeliveryError('Selected non-issue worktree has no exact registry owner.');
+    }
+    const row = matches[0];
+    assertAiDeliveryWorktreeOwner(row, root);
+    if (!existsSync(target) ||
+        gitRoot(target) !== realpathSync(target) ||
+        git(target, 'branch', '--show-current') !== row.branch) {
+        throw new DeliveryError('Registered non-issue worktree is missing or drifted.');
+    }
+    assertClean(target);
+    const head = git(target, 'rev-parse', 'HEAD');
+    const remoteRef = input.prNumber === undefined
+        ? `refs/remotes/origin/${row.branch}`
+        : `refs/remotes/origin/ai-delivery-pr-${input.prNumber}`;
+    const retainedByBase = gitExitCode(root, 'merge-base', '--is-ancestor', head, defaultBaseRef(root)) === 0;
+    const retainedByRemote = gitExitCode(root, 'show-ref', '--verify', '--quiet', remoteRef) === 0 &&
+        gitExitCode(root, 'merge-base', '--is-ancestor', head, remoteRef) === 0;
+    if (!retainedByBase && !retainedByRemote) {
+        throw new DeliveryError('Clean worktree has an unpublished commit; cleanup requires an exact retaining ref.');
+    }
+    git(root, 'worktree', 'remove', target);
+    await removeWorktreeEntry(target, root);
+}
+export async function cleanupMergedIssueWorktree(input) {
+    assertIssueNumber(input.issueNumber);
+    const root = primaryGitRoot(input.repoRoot);
+    const row = getIssueWorktreeStrict(input.issueNumber, root);
+    assertSafePath(root, row.path);
+    if (row.status !== 'merged' || row.path !== join(root, '.worktrees', `issue-${input.issueNumber}`)) {
+        throw new DeliveryError('Only the exact registered merged issue worktree can be cleaned.');
+    }
+    const present = existsSync(row.path);
+    if (present && gitRoot(row.path) !== realpathSync(row.path)) {
+        throw new DeliveryError('Registered worktree points elsewhere.');
+    }
+    if (!present && input.afterRemoval === undefined) {
+        throw new DeliveryError('Registered worktree is missing.');
+    }
+    if (present)
+        assertClean(row.path);
+    const base = defaultBaseRef(root);
+    const branchIncluded = gitExitCode(root, 'merge-base', '--is-ancestor', row.branch, base) === 0;
+    const attestation = input.merge;
+    if (attestation) {
+        if (attestation.headBranch !== row.branch ||
+            attestation.headSha !== git(present ? row.path : root, 'rev-parse', present ? 'HEAD' : row.branch) ||
+            (attestation.remoteHeadSha !== null && attestation.remoteHeadSha !== attestation.headSha) ||
+            attestation.baseBranch !== base.replace(/^origin\//u, '') ||
+            attestation.remoteBaseSha !== git(root, 'rev-parse', base) ||
+            gitExitCode(root, 'merge-base', '--is-ancestor', attestation.baseSha, attestation.mergeSha) !== 0 ||
+            gitExitCode(root, 'merge-base', '--is-ancestor', attestation.mergeSha, base) !== 0 ||
+            git(root, 'rev-parse', `${attestation.mergeSha}^{tree}`) !== attestation.mergeTree ||
+            (!branchIncluded && attestation.strategy === 'merge')) {
+            throw new DeliveryError('Exact merged-result cleanup attestation disagrees with Git or remote readback.');
+        }
+    }
+    else if (!branchIncluded) {
+        throw new DeliveryError('Branch is not included in the current base and exact merged-result attestation is absent.');
+    }
+    if (present)
+        git(root, 'worktree', 'remove', row.path);
+    await input.afterRemoval?.();
+    await removeWorktreeEntry(row.path, root);
+}
+//# sourceMappingURL=worktree.js.map

package/dist/worktree.js.map

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

package/package.json

@@ -0,0 +1,82 @@
+{
+  "name": "@aviaratech/ai-delivery",
+  "version": "0.1.0",
+  "private": false,
+  "description": "Generic GitHub issue and pull request delivery CLI and MCP server",
+  "homepage": "https://github.com/aviaratech/ai-delivery#readme",
+  "bugs": {
+    "url": "https://github.com/aviaratech/ai-delivery/issues"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/aviaratech/ai-delivery.git"
+  },
+  "bin": {
+    "ai-delivery": "./dist/cli.js"
+  },
+  "files": [
+    "dist",
+    "plugins/ai-delivery",
+    "README.md",
+    "CONTRIBUTING.md"
+  ],
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./agent": {
+      "types": "./dist/agent.d.ts",
+      "default": "./dist/agent.js"
+    },
+    "./delivery": {
+      "types": "./dist/delivery/index.d.ts",
+      "default": "./dist/delivery/index.js"
+    },
+    "./mcp": {
+      "types": "./dist/mcp/index.d.ts",
+      "default": "./dist/mcp/index.js"
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "format": "oxfmt src package.json tsconfig.json tsconfig.build.json vitest.config.ts .oxlintrc.json .oxfmtrc.json",
+    "format:check": "oxfmt --check src package.json tsconfig.json tsconfig.build.json vitest.config.ts .oxlintrc.json .oxfmtrc.json",
+    "lint": "oxlint",
+    "typecheck": "tsc -p tsconfig.json",
+    "build": "tsc -p tsconfig.build.json",
+    "postbuild": "node -e \"require('node:fs').chmodSync('dist/cli.js', 0o755)\"",
+    "test": "npm run build && vitest run",
+    "checks": "npm run format:check && npm run lint && npm run typecheck && npm test"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@octokit/auth-app": "^8.2.0",
+    "@octokit/graphql": "^9.0.3",
+    "@octokit/rest": "^22.0.1",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.3",
+    "proper-lockfile": "^4.1.2",
+    "zod": "^4.4.3"
+  },
+  "devDependencies": {
+    "@types/node": "^25.9.1",
+    "@types/proper-lockfile": "^4.1.4",
+    "oxfmt": "0.70.0",
+    "oxlint": "1.85.0",
+    "oxlint-tsgolint": "7.0.2003",
+    "typescript": "6.0.2",
+    "vitest": "5.0.1"
+  },
+  "engines": {
+    "node": ">=24.21.0 <25",
+    "npm": "11.19.0"
+  },
+  "packageManager": "npm@11.19.0"
+}

package/plugins/ai-delivery/.claude-plugin/plugin.json

@@ -0,0 +1,6 @@
+{
+  "name": "ai-delivery",
+  "description": "GitHub issue and pull request delivery tools for prepared worktrees and evidence-based handoff.",
+  "deliveryCapabilityVersion": 1,
+  "packageVersion": "0.1.0"
+}

package/plugins/ai-delivery/.mcp.json

@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "ai-delivery": {
+      "command": "node",
+      "args": ["${CLAUDE_PLUGIN_ROOT}/dist/mcp-launcher.js"]
+    }
+  }
+}

package/plugins/ai-delivery/README.md

@@ -0,0 +1,5 @@
+# ai-delivery plugin
+
+Thin host plugin for `@aviaratech/ai-delivery`. The launcher starts the installed package's `mcp:serve` command over stdio. MCP schemas, GitHub operations, worktree handling, and delivery logic remain in the package.
+
+The bundled skills cover issue intake, prepared worktree development, and pull request handoff. Install the package with its `plugins/ai-delivery` directory available to the host plugin loader. Point the host at `plugins/ai-delivery/dist/mcp-launcher.js` from the verified package installation, set the consuming repository's configured App credential environment outside source control, and issue the private runtime-admission record described in the [package guide](../../README.md) before a lifecycle write. Restart the host after installation so it loads the new launcher. A read-only `issue_info` call can confirm repository selection; verify App identity and role permissions before any mutation. Keep one active writer per issue and preserve its original worktree owner when upgrading.

package/plugins/ai-delivery/dist/mcp-launcher.js

@@ -0,0 +1,22 @@
+import { spawn } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+
+const packageEntry = import.meta.resolve('@aviaratech/ai-delivery');
+if (!packageEntry.startsWith('file:')) {
+  throw new Error('Cannot resolve the installed @aviaratech/ai-delivery package to a file');
+}
+
+const cliEntry = fileURLToPath(new URL('./cli.js', packageEntry));
+const child = spawn(process.execPath, [cliEntry, 'mcp:serve'], {
+  env: process.env,
+  stdio: 'inherit',
+});
+
+child.on('error', (error) => {
+  process.stderr.write(`Unable to start ai-delivery MCP server: ${error.message}\n`);
+  process.exitCode = 1;
+});
+
+child.on('close', (code, signal) => {
+  process.exitCode = code ?? (signal ? 1 : 0);
+});

package/plugins/ai-delivery/skills/intake-create/SKILL.md

@@ -0,0 +1,26 @@
+---
+name: "ai-delivery:intake-create"
+description: Create or inspect a GitHub tracking issue and check whether it is ready for development.
+---
+
+# Issue intake
+
+Use the native GitHub issue as the source of truth for issue details and relationships. Keep the title and body concrete: describe the problem, available evidence, acceptance criteria, and verification command.
+
+## MCP tools first
+
+1. Use `issue_create` to create one coherent tracking issue with the applicable native issue metadata and relationships.
+2. Use `issue_info` to inspect a known issue and `issue_update` for authoritative metadata, relationship, or lifecycle changes.
+3. Run `issue_ready_check` before development. Resolve any reported gaps in the issue before proceeding.
+4. Continue with `issue_develop` when the issue is ready.
+
+## CLI fallback
+
+When MCP is unavailable, use the installed `ai-delivery` command:
+
+```bash
+ai-delivery create
+ai-delivery info --issue <number>
+ai-delivery ready:check --issue <number>
+ai-delivery develop --issue <number>
+```

package/plugins/ai-delivery/skills/pr-handoff/SKILL.md

@@ -0,0 +1,28 @@
+---
+name: "ai-delivery:pr-handoff"
+description: Publish a verified change, submit independent review evidence, and complete guarded pull request delivery.
+---
+
+# Pull request handoff
+
+Use the verified commit and its evidence throughout publication, review, and merge. If the commit changes, verify the new commit and obtain review for its exact pull request head.
+
+## MCP tools first
+
+1. Run `issue_verify` on the committed change.
+2. Publish it as a draft with `issue_pr_create`, then inspect it with `issue_pr_info` as needed.
+3. Obtain an independent review of the exact pull request head and submit its evidence with `issue_pr_review`.
+4. Once the approval and required checks are present, promote the pull request and use `issue_finish` to complete guarded delivery and cleanup.
+
+Missing or stale evidence, a changed head, failed checks, conflicts, or unresolved blockers require resolution before continuing.
+
+## CLI fallback
+
+```bash
+ai-delivery verify
+ai-delivery pr:create --issue <number>
+# obtain independent review of the exact pull request head
+ai-delivery pr:review --pr <number> --artifact <review-artifact>
+ai-delivery pr:create --issue <number> --ready
+ai-delivery finish --issue <number> --pr <number>
+```

package/plugins/ai-delivery/skills/worktree-lifecycle/SKILL.md

@@ -0,0 +1,24 @@
+---
+name: "ai-delivery:worktree-lifecycle"
+description: Prepare an issue-backed or explicitly standalone worktree, develop there, and verify the resulting commit.
+---
+
+# Prepared worktree lifecycle
+
+Use a registered prepared worktree for implementation so changes and delivery evidence stay associated with the intended issue.
+
+## MCP tools first
+
+1. For tracked work, inspect the issue with `issue_info`, check it with `issue_ready_check`, then prepare it with `issue_develop`.
+2. For explicitly standalone work, use `issue_worktree_create`.
+3. Make changes in the prepared worktree, run the focused checks, and commit the change.
+4. Run `issue_verify` after the commit. Continue to pull request handoff with the exact verified commit.
+
+## CLI fallback
+
+```bash
+ai-delivery ready:check --issue <number>
+ai-delivery develop --issue <number>
+# edit, run focused checks, and commit in the prepared worktree
+ai-delivery verify
+```