glop.dev 0.11.0 → 0.12.0

package/dist/index.js

@@ -434,13 +434,31 @@ var doctorCommand = new Command3("doctor").description("Check that glop is set u
   } else {
     fail("Global hooks installed", "run `glop login`");
   }
-  const repoBinding = loadRepoConfig();
-  if (repoBinding) {
-    check("pass", "Repo bound to workspace", repoBinding.workspace_id);
-  } else if (repoRoot) {
-    check("warn", "Repo bound to workspace", "run `glop link` to bind this repo");
-  } else {
-    check("warn", "Repo bound to workspace", "not in a git repo");
+  if (repoRoot) {
+    const repoBinding = loadRepoConfig();
+    if (repoBinding) {
+      let workspaceLabel = repoBinding.workspace_id;
+      try {
+        const wsRes = await fetch(`${config.server_url}/api/v1/cli/workspaces`, {
+          headers: {
+            Authorization: `Bearer ${config.api_key}`,
+            "X-Machine-Id": config.machine_id
+          },
+          signal: AbortSignal.timeout(5e3)
+        });
+        if (wsRes.ok) {
+          const data = await wsRes.json();
+          const ws = data.workspaces.find((w) => w.id === repoBinding.workspace_id);
+          if (ws) {
+            workspaceLabel = ws.name;
+          }
+        }
+      } catch {
+      }
+      check("pass", "Repo bound to workspace", workspaceLabel);
+    } else {
+      check("warn", "Repo bound to workspace", "run `glop link` to bind this repo");
+    }
   }
   try {
     const which = execSync3("which glop", {
@@ -475,6 +493,14 @@ import { spawn } from "child_process";
 import { fileURLToPath } from "url";
 import path5 from "path";
 var PR_URL_RE = /(https:\/\/github\.com\/[^\s]+\/pull\/\d+)/;
+function extractBashOutput(response) {
+  if (!response || typeof response !== "object") return "";
+  const r = response;
+  const parts = [];
+  if (typeof r.stdout === "string") parts.push(r.stdout);
+  if (typeof r.stderr === "string") parts.push(r.stderr);
+  return parts.join("\n");
+}
 function extractSlugFromTranscript(transcriptPath) {
   try {
     const fd = openSync(transcriptPath, "r");
@@ -512,9 +538,10 @@ var hookCommand = new Command4("__hook").description("internal").action(async ()
   payload.workspace_id = repoConfig.workspace_id;
   payload.git_user_name = getGitUserName();
   payload.git_user_email = getGitUserEmail();
-  if (payload.hook_event_name === "PostToolUse" && payload.tool_name === "Bash" && typeof payload.tool_response === "string" && /\bgit\s+commit\b/.test(
+  const toolOutput = payload.hook_event_name === "PostToolUse" && payload.tool_name === "Bash" ? extractBashOutput(payload.tool_response) : "";
+  if (toolOutput && /\bgit\s+commit\b/.test(
     typeof payload.tool_input?.command === "string" ? payload.tool_input.command : ""
-  ) && /\[\w[^\]]*\s+[a-f0-9]{7,}\]/.test(payload.tool_response)) {
+  ) && /\[\w[^\]]*\s+[a-f0-9]{7,}\]/.test(toolOutput)) {
     const diffStats = getCommitDiffStats();
     if (diffStats) {
       payload.commit_diff_stats = diffStats;
@@ -526,10 +553,10 @@ var hookCommand = new Command4("__hook").description("internal").action(async ()
     if (slug) payload.slug = slug;
   }
   let prUrl = null;
-  if (payload.hook_event_name === "PostToolUse" && payload.tool_name === "Bash" && typeof payload.tool_response === "string" && /\bgh\s+pr\s+create\b/.test(
+  if (toolOutput && /\bgh\s+pr\s+create\b/.test(
     typeof payload.tool_input?.command === "string" ? payload.tool_input.command : ""
   )) {
-    const prMatch = payload.tool_response.match(PR_URL_RE);
+    const prMatch = toolOutput.match(PR_URL_RE);
     if (prMatch) prUrl = prMatch[1];
   }
   try {
@@ -801,7 +828,7 @@ async function checkForUpdate(currentVersion) {
 // package.json
 var package_default = {
   name: "glop.dev",
-  version: "0.11.0",
+  version: "0.12.0",
   type: "module",
   bin: {
     glop: "./dist/index.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glop.dev",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "type": "module",
   "bin": {
     "glop": "./dist/index.js"