waypoint-codex 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waypoint-codex",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Codex-native repository operating system: scaffolding, docs routing, repo-local skills, doctor, and sync.",
   "license": "MIT",
   "type": "module",

package/templates/.waypoint/scripts/prepare-context.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from "node:fs";
-import { execSync } from "node:child_process";
+import { execFileSync } from "node:child_process";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
@@ -23,16 +23,96 @@ function ensureDir(dirPath) {
   mkdirSync(dirPath, { recursive: true });
 }
 
-function safeExec(command, cwd) {
+function runCommand(command, cwd) {
   try {
-    return execSync(command, {
-      cwd,
-      stdio: ["ignore", "pipe", "ignore"],
-      encoding: "utf8",
-    }).trim();
-  } catch {
-    return "";
+    return {
+      ok: true,
+      stdout: execFileSync(command[0], command.slice(1), {
+        cwd,
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf8",
+      }).trim(),
+      stderr: "",
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      stdout: typeof error?.stdout === "string" ? error.stdout.trim() : "",
+      stderr:
+        typeof error?.stderr === "string" && error.stderr.trim().length > 0
+          ? error.stderr.trim()
+          : error instanceof Error
+            ? error.message
+            : "Unknown command failure",
+    };
+  }
+}
+
+function safeExec(command, cwd) {
+  const result = runCommand(command, cwd);
+  return result.ok ? result.stdout : "";
+}
+
+function escapeRegex(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+function currentAuthorFilter(projectRoot) {
+  const email = runCommand(["git", "config", "user.email"], projectRoot);
+  if (email.ok && email.stdout) {
+    return {
+      label: email.stdout,
+      pattern: escapeRegex(email.stdout),
+    };
+  }
+
+  const name = runCommand(["git", "config", "user.name"], projectRoot);
+  if (name.ok && name.stdout) {
+    return {
+      label: name.stdout,
+      pattern: `^${escapeRegex(name.stdout)}\\s<`,
+    };
+  }
+
+  return null;
+}
+
+function githubPullRequestContext(projectRoot) {
+  const repo = runCommand(["gh", "repo", "view", "--json", "nameWithOwner", "--jq", ".nameWithOwner"], projectRoot);
+  if (!repo.ok || !repo.stdout) {
+    return {
+      ok: false,
+      error: repo.stderr || "Could not resolve GitHub repository from this checkout.",
+    };
+  }
+
+  const viewer = runCommand(["gh", "api", "user", "--jq", ".login"], projectRoot);
+  if (!viewer.ok || !viewer.stdout) {
+    return {
+      ok: false,
+      error: viewer.stderr || "Could not resolve active GitHub user.",
+    };
+  }
+
+  return {
+    ok: true,
+    repo: repo.stdout,
+    viewer: viewer.stdout,
+  };
+}
+
+function renderCommandBlock(result, emptyMessage) {
+  if (!result.ok) {
+    return `Command failed: ${result.stderr}`;
+  }
+  return result.stdout || emptyMessage;
+}
+
+function renderPullRequestBlock(result, emptyMessage) {
+  if (!result.ok) {
+    return `Command failed: ${result.error || result.stderr}`;
   }
+  return result.stdout || emptyMessage;
 }
 
 const SESSION_DIR_NAMES = ["sessions", "archived_sessions"];
@@ -242,6 +322,25 @@ function writeRecentThread(contextDir, projectRoot) {
     return filePath;
   }
 
+  if (!snapshot.selectedFromPreCompaction) {
+    writeFileSync(
+      filePath,
+      [
+        "# Recent Thread",
+        "",
+        `Generated by \`${path.relative(projectRoot, fileURLToPath(import.meta.url))}\` on ${generatedAt}.`,
+        "",
+        `- Source session: \`${path.relative(codexHome(), snapshot.path)}\``,
+        `- Session cwd: \`${snapshot.sessionCwd}\``,
+        `- Compactions in source session: ${snapshot.compactionCount}`,
+        "- No compaction was found in the latest matching local Codex session, so there is nothing to restore into startup context yet.",
+        "",
+      ].join("\n"),
+      "utf8"
+    );
+    return filePath;
+  }
+
   const selectedTurns = snapshot.turns.slice(-MAX_RECENT_TURNS);
   const relSessionPath = path.relative(codexHome(), snapshot.path);
   const lines = [
@@ -329,21 +428,58 @@ function main() {
     contextDir,
     "UNCOMMITTED_CHANGES.md",
     "Uncommitted Changes",
-    `\`\`\`\n${safeExec("git diff --stat", projectRoot) || "No uncommitted changes."}\n\`\`\``
+    (() => {
+      const status = runCommand(["git", "status", "--short", "--branch"], projectRoot);
+      const unstaged = runCommand(["git", "diff", "--stat"], projectRoot);
+      const staged = runCommand(["git", "diff", "--stat", "--cached"], projectRoot);
+      return [
+        "## Status",
+        "",
+        "```",
+        renderCommandBlock(status, "No uncommitted changes."),
+        "```",
+        "",
+        "## Diff Stat",
+        "",
+        "```",
+        renderCommandBlock(unstaged, "No unstaged tracked diff."),
+        "```",
+        "",
+        "## Staged Diff Stat",
+        "",
+        "```",
+        renderCommandBlock(staged, "No staged diff."),
+        "```",
+      ].join("\n");
+    })()
   );
 
+  const authorFilter = currentAuthorFilter(projectRoot);
+  const recentCommitsResult = authorFilter
+    ? runCommand(["git", "log", `--author=${authorFilter.pattern}`, "--format=%h%d %s (%cr)", "-20", "--all"], projectRoot)
+    : {
+        ok: false,
+        stdout: "",
+        stderr: "Could not determine current git author from local git config.",
+      };
   const recentCommitsPath = writeContextFile(
     contextDir,
     "RECENT_COMMITS.md",
     "Recent Commits",
-    `\`\`\`\n${safeExec("git log --format=%h%d %s (%cr) -20 --all", projectRoot) || "No recent commits found."}\n\`\`\``
+    [
+      authorFilter ? `Author filter: ${authorFilter.label}` : "Author filter: unavailable",
+      "",
+      "```",
+      renderCommandBlock(recentCommitsResult, "No recent commits found for the current author."),
+      "```",
+    ].join("\n")
   );
 
   const nestedRepos = collectNestedGitRepos(projectRoot);
   const nestedRepoSections = nestedRepos.map((repoPath) => {
     const rel = path.relative(projectRoot, repoPath) || ".";
-    const branch = safeExec("git branch --show-current", repoPath) || "unknown";
-    const commits = safeExec("git log --format=%h %s (%cr) -10", repoPath) || "No recent commits found.";
+    const branch = safeExec(["git", "branch", "--show-current"], repoPath) || "unknown";
+    const commits = safeExec(["git", "log", "--format=%h %s (%cr)", "-10"], repoPath) || "No recent commits found.";
     return `## ${rel}\n\nBranch: ${branch}\n\n\`\`\`\n${commits}\n\`\`\``;
   });
   const nestedReposPath = writeContextFile(
@@ -353,29 +489,71 @@ function main() {
     nestedRepoSections.join("\n\n") || "No nested repositories found."
   );
 
-  const openPrs = safeExec(
-    "gh pr list --state open --author @me --limit 5 --json number,title,author,headRefName --template '{{range .}}#{{.number}} {{.title}} ({{.author.login}}) [{{.headRefName}}]\\n{{end}}'",
-    projectRoot
-  );
-  const mergedPrs = safeExec(
-    "gh pr list --state merged --author @me --limit 5 --json number,title,author,mergedAt --template '{{range .}}#{{.number}} {{.title}} ({{.author.login}}) merged {{timeago .mergedAt}}\\n{{end}}'",
-    projectRoot
-  );
+  const prContext = githubPullRequestContext(projectRoot);
+  const openPrs =
+    prContext.ok
+      ? runCommand(
+          [
+            "gh",
+            "pr",
+            "list",
+            "--repo",
+            prContext.repo,
+            "--state",
+            "open",
+            "--author",
+            prContext.viewer,
+            "--limit",
+            "5",
+            "--json",
+            "number,title,author,headRefName",
+            "--template",
+            "{{range .}}#{{.number}} {{.title}} ({{.author.login}}) [{{.headRefName}}]\n{{end}}",
+          ],
+          projectRoot
+        )
+      : prContext;
+  const mergedPrs =
+    prContext.ok
+      ? runCommand(
+          [
+            "gh",
+            "pr",
+            "list",
+            "--repo",
+            prContext.repo,
+            "--state",
+            "merged",
+            "--author",
+            prContext.viewer,
+            "--limit",
+            "5",
+            "--json",
+            "number,title,author,mergedAt",
+            "--template",
+            "{{range .}}#{{.number}} {{.title}} ({{.author.login}}) merged {{timeago .mergedAt}}\n{{end}}",
+          ],
+          projectRoot
+        )
+      : prContext;
   const prsPath = writeContextFile(
     contextDir,
     "PULL_REQUESTS.md",
     "Pull Requests",
     [
+      prContext.ok ? `GitHub viewer: ${prContext.viewer}` : `GitHub context: ${prContext.error}`,
+      prContext.ok ? `GitHub repo: ${prContext.repo}` : "",
+      "",
       "## Open PRs",
       "",
       "```",
-      openPrs || "No open PRs found.",
+      renderPullRequestBlock(openPrs, "No open PRs found for the current GitHub user."),
       "```",
       "",
       "## Recently Merged PRs",
       "",
       "```",
-      mergedPrs || "No recently merged PRs found.",
+      renderPullRequestBlock(mergedPrs, "No recently merged PRs found for the current GitHub user."),
       "```",
     ].join("\n")
   );