@orderful/droid 0.24.0 → 0.25.1

package/dist/tools/codex/skills/droid-codex/scripts/git-finish-write.ts

@@ -0,0 +1,236 @@
+#!/usr/bin/env bun
+/**
+ * codex git-finish-write
+ *
+ * Completes a write operation by committing, pushing, creating a PR,
+ * and returning to main.
+ *
+ * Usage:
+ *   droid config codex | droid exec droid-codex git-finish-write --config - \
+ *     --message "feat: add new topic" \
+ *     --pr-title "New topic: caching" \
+ *     --pr-body "Added exploration of caching patterns"
+ *
+ * Options:
+ *   --config <json>     Config with codex_repo path (required)
+ *   --message <text>    Commit message (required)
+ *   --pr-title <text>   PR title (required)
+ *   --pr-body <text>    PR body (optional, defaults to commit message)
+ *
+ * What it does:
+ *   1. Stage all changes
+ *   2. Commit with message
+ *   3. Push branch to origin
+ *   4. Create PR via gh CLI
+ *   5. Return to main branch
+ *
+ * Output (JSON):
+ *   { "success": true, "pr_url": "https://github.com/...", "branch": "codex/topic-caching" }
+ */
+
+import { execSync } from 'child_process';
+import { readFileSync, existsSync } from 'fs';
+
+interface Config {
+  codex_repo: string;
+}
+
+interface Result {
+  success: boolean;
+  pr_url?: string;
+  branch?: string;
+  error?: string;
+}
+
+function parseArgs(args: string[]): {
+  config: Config | null;
+  message: string | null;
+  prTitle: string | null;
+  prBody: string | null;
+} {
+  let config: Config | null = null;
+  let message: string | null = null;
+  let prTitle: string | null = null;
+  let prBody: string | null = null;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--config' && args[i + 1]) {
+      const configArg = args[++i];
+      if (configArg === '-') {
+        const stdin = readFileSync(0, 'utf-8').trim();
+        config = JSON.parse(stdin) as Config;
+      } else {
+        config = JSON.parse(configArg) as Config;
+      }
+    } else if (arg === '--message' && args[i + 1]) {
+      message = args[++i];
+    } else if (arg === '--pr-title' && args[i + 1]) {
+      prTitle = args[++i];
+    } else if (arg === '--pr-body' && args[i + 1]) {
+      prBody = args[++i];
+    }
+  }
+
+  return { config, message, prTitle, prBody };
+}
+
+function expandPath(p: string): string {
+  if (p.startsWith('~/')) {
+    return p.replace('~', process.env.HOME || '');
+  }
+  return p;
+}
+
+function run(cmd: string, cwd: string): { ok: boolean; output: string } {
+  try {
+    const output = execSync(cmd, {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    return { ok: true, output: output.trim() };
+  } catch (err: unknown) {
+    const error = err as { stderr?: string; stdout?: string; message?: string };
+    return { ok: false, output: error.stderr || error.stdout || error.message || 'Unknown error' };
+  }
+}
+
+function gitFinishWrite(
+  repoPath: string,
+  commitMessage: string,
+  prTitle: string,
+  prBody: string
+): Result {
+  const cwd = expandPath(repoPath);
+
+  // Verify repo exists
+  if (!existsSync(cwd)) {
+    return { success: false, error: `Codex repo not found at ${cwd}` };
+  }
+
+  // Get current branch
+  const branchResult = run('git branch --show-current', cwd);
+  if (!branchResult.ok) {
+    return { success: false, error: `Failed to get current branch: ${branchResult.output}` };
+  }
+  const branch = branchResult.output;
+
+  // Don't allow commits directly to main
+  if (branch === 'main') {
+    return { success: false, error: 'Cannot commit directly to main. Use git-start-write first to create a branch.' };
+  }
+
+  // 1. Stage all changes
+  const add = run('git add -A', cwd);
+  if (!add.ok) {
+    return { success: false, error: `Failed to stage changes: ${add.output}` };
+  }
+
+  // Check if there are changes to commit
+  const status = run('git status --porcelain', cwd);
+  if (status.ok && status.output.length === 0) {
+    return { success: false, error: 'No changes to commit' };
+  }
+
+  // 2. Commit (use heredoc-style to avoid injection)
+  // Write commit message to a temp approach using -F -
+  const commit = run(`git commit -m "${commitMessage.replace(/"/g, '\\"')}"`, cwd);
+  if (!commit.ok) {
+    return { success: false, error: `Failed to commit: ${commit.output}` };
+  }
+
+  // 3. Push to origin
+  const push = run(`git push -u origin ${branch}`, cwd);
+  if (!push.ok) {
+    // Try force push if branch exists with different history
+    const forcePush = run(`git push -u origin ${branch} --force-with-lease`, cwd);
+    if (!forcePush.ok) {
+      return { success: false, error: `Failed to push: ${forcePush.output}` };
+    }
+  }
+
+  // 4. Create PR via gh CLI
+  const escapedTitle = prTitle.replace(/"/g, '\\"');
+  const escapedBody = prBody.replace(/"/g, '\\"');
+  const prCreate = run(
+    `gh pr create --title "${escapedTitle}" --body "${escapedBody}" 2>&1 || gh pr view --json url -q .url`,
+    cwd
+  );
+
+  let prUrl = '';
+  if (prCreate.ok) {
+    // Output might be the PR URL directly or JSON
+    const output = prCreate.output;
+    if (output.startsWith('https://')) {
+      prUrl = output.split('\n')[0]; // First line is the URL
+    } else {
+      // Try to extract URL from output
+      const urlMatch = output.match(/https:\/\/github\.com\/[^\s]+/);
+      if (urlMatch) {
+        prUrl = urlMatch[0];
+      }
+    }
+  }
+
+  // 5. Return to main
+  const checkoutMain = run('git checkout main', cwd);
+  if (!checkoutMain.ok) {
+    // Non-fatal - PR was created, just warn
+    console.error(`Warning: Failed to return to main: ${checkoutMain.output}`);
+  }
+
+  return {
+    success: true,
+    pr_url: prUrl || 'PR created (check GitHub)',
+    branch,
+  };
+}
+
+// Main
+const args = process.argv.slice(2);
+const { config, message, prTitle, prBody } = parseArgs(args);
+
+if (!config) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing --config. Usage: droid config codex | droid exec droid-codex git-finish-write --config - --message "..." --pr-title "..."',
+  }));
+  process.exit(1);
+}
+
+if (!config.codex_repo) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing codex_repo in config',
+  }));
+  process.exit(1);
+}
+
+if (!message) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing --message argument',
+  }));
+  process.exit(1);
+}
+
+if (!prTitle) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing --pr-title argument',
+  }));
+  process.exit(1);
+}
+
+const result = gitFinishWrite(
+  config.codex_repo,
+  message,
+  prTitle,
+  prBody || message
+);
+console.log(JSON.stringify(result, null, 2));
+
+if (!result.success) {
+  process.exit(1);
+}

package/dist/tools/codex/skills/droid-codex/scripts/git-preamble.d.ts

@@ -0,0 +1,20 @@
+#!/usr/bin/env bun
+/**
+ * codex git-preamble
+ *
+ * Ensures the codex repo is on a clean main branch with latest changes.
+ * Run this before ANY codex operation (read or write).
+ *
+ * Usage:
+ *   droid config codex | droid exec droid-codex git-preamble --config -
+ *
+ * What it does:
+ *   1. Checkout main (abort any stuck merge/rebase)
+ *   2. Stash any uncommitted changes
+ *   3. Pull latest with rebase
+ *
+ * Output (JSON):
+ *   { "success": true, "branch": "main", "stashed": false }
+ */
+export {};
+//# sourceMappingURL=git-preamble.d.ts.map

package/dist/tools/codex/skills/droid-codex/scripts/git-preamble.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-preamble.d.ts","sourceRoot":"","sources":["../../../../../../src/tools/codex/skills/droid-codex/scripts/git-preamble.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;GAgBG"}

package/dist/tools/codex/skills/droid-codex/scripts/git-preamble.ts

@@ -0,0 +1,156 @@
+#!/usr/bin/env bun
+/**
+ * codex git-preamble
+ *
+ * Ensures the codex repo is on a clean main branch with latest changes.
+ * Run this before ANY codex operation (read or write).
+ *
+ * Usage:
+ *   droid config codex | droid exec droid-codex git-preamble --config -
+ *
+ * What it does:
+ *   1. Checkout main (abort any stuck merge/rebase)
+ *   2. Stash any uncommitted changes
+ *   3. Pull latest with rebase
+ *
+ * Output (JSON):
+ *   { "success": true, "branch": "main", "stashed": false }
+ */
+
+import { execSync } from 'child_process';
+import { readFileSync, existsSync } from 'fs';
+
+interface Config {
+  codex_repo: string;
+}
+
+interface Result {
+  success: boolean;
+  branch?: string;
+  stashed?: boolean;
+  error?: string;
+}
+
+function parseArgs(args: string[]): { config: Config | null } {
+  let config: Config | null = null;
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
+    if (arg === '--config' && args[i + 1]) {
+      const configArg = args[++i];
+      if (configArg === '-') {
+        const stdin = readFileSync(0, 'utf-8').trim();
+        config = JSON.parse(stdin) as Config;
+      } else {
+        config = JSON.parse(configArg) as Config;
+      }
+    }
+  }
+
+  return { config };
+}
+
+function expandPath(p: string): string {
+  if (p.startsWith('~/')) {
+    return p.replace('~', process.env.HOME || '');
+  }
+  return p;
+}
+
+function run(cmd: string, cwd: string): { ok: boolean; output: string } {
+  try {
+    const output = execSync(cmd, {
+      cwd,
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    return { ok: true, output: output.trim() };
+  } catch (err: unknown) {
+    const error = err as { stderr?: string; message?: string };
+    return { ok: false, output: error.stderr || error.message || 'Unknown error' };
+  }
+}
+
+function gitPreamble(repoPath: string): Result {
+  const cwd = expandPath(repoPath);
+
+  // Verify repo exists
+  if (!existsSync(cwd)) {
+    return {
+      success: false,
+      error: `Codex repo not found at ${cwd}. Run: git clone git@github.com:orderful/orderful-codex.git ${cwd}`,
+    };
+  }
+
+  // 1. Abort any stuck operations (silent failures are fine)
+  run('git merge --abort', cwd);
+  run('git rebase --abort', cwd);
+  run('git cherry-pick --abort', cwd);
+
+  // 2. Checkout main
+  const checkout = run('git checkout main', cwd);
+  if (!checkout.ok && !checkout.output.includes('Already on')) {
+    return {
+      success: false,
+      error: `Failed to checkout main: ${checkout.output}`,
+    };
+  }
+
+  // 3. Stash any uncommitted changes
+  const statusCheck = run('git status --porcelain', cwd);
+  let stashed = false;
+  if (statusCheck.ok && statusCheck.output.length > 0) {
+    const stash = run('git stash push -m "codex-auto-stash"', cwd);
+    stashed = stash.ok && !stash.output.includes('No local changes');
+  }
+
+  // 4. Pull latest
+  const pull = run('git pull --rebase', cwd);
+  if (!pull.ok) {
+    // Try to recover - maybe there's a conflict
+    run('git rebase --abort', cwd);
+    const retryPull = run('git pull --rebase', cwd);
+    if (!retryPull.ok) {
+      return {
+        success: false,
+        error: `Failed to pull latest: ${retryPull.output}. The codex repo may have conflicts that need manual resolution.`,
+      };
+    }
+  }
+
+  // Get current branch to confirm
+  const branch = run('git branch --show-current', cwd);
+
+  return {
+    success: true,
+    branch: branch.ok ? branch.output : 'main',
+    stashed,
+  };
+}
+
+// Main
+const args = process.argv.slice(2);
+const { config } = parseArgs(args);
+
+if (!config) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing --config. Usage: droid config codex | droid exec droid-codex git-preamble --config -',
+  }));
+  process.exit(1);
+}
+
+if (!config.codex_repo) {
+  console.log(JSON.stringify({
+    success: false,
+    error: 'Missing codex_repo in config. Run: droid config codex --set codex_repo=~/path/to/codex',
+  }));
+  process.exit(1);
+}
+
+const result = gitPreamble(config.codex_repo);
+console.log(JSON.stringify(result, null, 2));
+
+if (!result.success) {
+  process.exit(1);
+}