sisyphi 1.2.16 → 1.2.17

package/README.md

@@ -330,13 +330,13 @@ Run `configure-upload` with that URL to write credentials to `~/.sisyphus/config
 
 ```bash
 # Safest — no argv leak:
-pbpaste | sis admin configure-upload --stdin
+pbpaste | sis admin report configure-upload --stdin
 
 # Interactive prompt:
-sis admin configure-upload
+sis admin report configure-upload
 
 # Direct argv (triggers a leak warning — token visible via `ps` and shell history):
-sis admin configure-upload "https://<worker-host>/upload?token=sisyphus_pat_..."
+sis admin report configure-upload "https://<worker-host>/upload?token=sisyphus_pat_..."
 ```
 
 **Config** — `configure-upload` always writes to `~/.sisyphus/config.json`. The `upload` block is only honored from the global config; a project-local `.sisyphus/config.json` with an `upload` block is ignored with a warning (security hardening — prevents project files from redirecting your uploads).

package/dist/cli.js

@@ -1038,6 +1038,51 @@ var init_version = __esm({
   }
 });
 
+// src/shared/upload.ts
+import { readFile } from "fs/promises";
+function parseWorkerError(body) {
+  try {
+    const parsed = JSON.parse(body);
+    if (parsed && typeof parsed.error === "string") return parsed.error;
+  } catch {
+  }
+  return body;
+}
+function isUploadConfigured(upload) {
+  return !!upload && upload.url.length > 0 && upload.token.length > 0;
+}
+async function uploadSession(args2) {
+  const { config, zipPath, manifest } = args2;
+  const formData = new FormData();
+  formData.append("manifest", new Blob([JSON.stringify(manifest)], { type: "application/json" }));
+  formData.append("bundle", new Blob([await readFile(zipPath)], { type: "application/zip" }), `${manifest.sessionId}.zip`);
+  const res = await fetch(`${config.url}/upload`, {
+    method: "POST",
+    headers: { Authorization: `Bearer ${config.token}` },
+    body: formData
+  });
+  if (!res.ok) {
+    const rawBody = await res.text();
+    const body = rawBody.length > 4096 ? rawBody.slice(0, 4096) + "\u2026 [truncated]" : rawBody;
+    throw new UploadError(res.status, body);
+  }
+  return res.json();
+}
+var UploadError;
+var init_upload = __esm({
+  "src/shared/upload.ts"() {
+    "use strict";
+    UploadError = class extends Error {
+      constructor(status, rawBody) {
+        const parsed = parseWorkerError(rawBody);
+        super(`HTTP ${status}: ${parsed}`);
+        this.status = status;
+      }
+      status;
+    };
+  }
+});
+
 // src/shared/session-export.ts
 import { execFile as execFile2 } from "child_process";
 import { promisify } from "util";
@@ -1166,51 +1211,6 @@ var init_session_export = __esm({
   }
 });
 
-// src/shared/upload.ts
-import { readFile } from "fs/promises";
-function parseWorkerError(body) {
-  try {
-    const parsed = JSON.parse(body);
-    if (parsed && typeof parsed.error === "string") return parsed.error;
-  } catch {
-  }
-  return body;
-}
-function isUploadConfigured(upload) {
-  return !!upload && upload.url.length > 0 && upload.token.length > 0;
-}
-async function uploadSession(args2) {
-  const { config, zipPath, manifest } = args2;
-  const formData = new FormData();
-  formData.append("manifest", new Blob([JSON.stringify(manifest)], { type: "application/json" }));
-  formData.append("bundle", new Blob([await readFile(zipPath)], { type: "application/zip" }), `${manifest.sessionId}.zip`);
-  const res = await fetch(`${config.url}/upload`, {
-    method: "POST",
-    headers: { Authorization: `Bearer ${config.token}` },
-    body: formData
-  });
-  if (!res.ok) {
-    const rawBody = await res.text();
-    const body = rawBody.length > 4096 ? rawBody.slice(0, 4096) + "\u2026 [truncated]" : rawBody;
-    throw new UploadError(res.status, body);
-  }
-  return res.json();
-}
-var UploadError;
-var init_upload = __esm({
-  "src/shared/upload.ts"() {
-    "use strict";
-    UploadError = class extends Error {
-      constructor(status, rawBody) {
-        const parsed = parseWorkerError(rawBody);
-        super(`HTTP ${status}: ${parsed}`);
-        this.status = status;
-      }
-      status;
-    };
-  }
-});
-
 // src/shared/manifest.ts
 import os2 from "os";
 function mapEffortFallback(level) {
@@ -2446,12 +2446,12 @@ var init_tailscale = __esm({
 });
 
 // src/cli/deploy/runner.ts
-import { spawn as spawn2, spawnSync as spawnSync3 } from "child_process";
+import { spawn as spawn2, spawnSync as spawnSync5 } from "child_process";
 import { copyFileSync as copyFileSync3, existsSync as existsSync34, mkdirSync as mkdirSync17, readFileSync as readFileSync34 } from "fs";
 function runTerraform(provider, args2, extraEnv) {
   ensureProviderStateDir(provider);
   ensureTerraformInstalled();
-  const result = spawnSync3("terraform", args2, {
+  const result = spawnSync5("terraform", args2, {
     cwd: providerModuleDir(provider),
     stdio: "inherit",
     env: { ...EXEC_ENV, ...extraEnv }
@@ -2460,7 +2460,7 @@ function runTerraform(provider, args2, extraEnv) {
   return result.status === null ? 1 : result.status;
 }
 function ensureTerraformInstalled() {
-  const result = spawnSync3("terraform", ["version"], { stdio: "pipe", env: EXEC_ENV });
+  const result = spawnSync5("terraform", ["version"], { stdio: "pipe", env: EXEC_ENV });
   if (result.error || result.status !== 0) {
     const platform = process.platform;
     const hint = platform === "darwin" ? "brew install terraform" : "See https://developer.hashicorp.com/terraform/install";
@@ -2488,7 +2488,7 @@ or pass --ssh-key <path>.`
   return readFileSync34(path, "utf-8").trim();
 }
 function readOutputs(provider) {
-  const result = spawnSync3("terraform", ["output", "-json", `-state=${deployStatePath(provider)}`], {
+  const result = spawnSync5("terraform", ["output", "-json", `-state=${deployStatePath(provider)}`], {
     cwd: providerModuleDir(provider),
     encoding: "utf-8",
     env: EXEC_ENV
@@ -2672,7 +2672,7 @@ function effectiveSshTarget(provider) {
 }
 function deploySsh(provider, remoteCmd) {
   const target = effectiveSshTarget(provider);
-  const moshAvailable = spawnSync3("mosh", ["--version"], { stdio: "pipe", env: EXEC_ENV }).status === 0;
+  const moshAvailable = spawnSync5("mosh", ["--version"], { stdio: "pipe", env: EXEC_ENV }).status === 0;
   const bin = moshAvailable && remoteCmd.length === 0 ? "mosh" : "ssh";
   const args2 = remoteCmd.length > 0 ? [target, ...remoteCmd] : [target];
   const child = spawn2(bin, args2, { stdio: "inherit", env: EXEC_ENV });
@@ -2734,10 +2734,10 @@ var init_runner = __esm({
 });
 
 // src/cli/deploy/ssh-exec.ts
-import { spawn as spawn3, spawnSync as spawnSync4 } from "child_process";
+import { spawn as spawn3, spawnSync as spawnSync6 } from "child_process";
 function runOnBox(provider, cmd) {
   const target = effectiveSshTarget(provider);
-  const result = spawnSync4("ssh", [target, cmd], {
+  const result = spawnSync6("ssh", [target, cmd], {
     encoding: "utf-8",
     env: EXEC_ENV
   });
@@ -2798,11 +2798,11 @@ var init_grove = __esm({
 });
 
 // src/cli/cloud/repo.ts
-import { spawnSync as spawnSync5 } from "child_process";
+import { spawnSync as spawnSync7 } from "child_process";
 import { existsSync as existsSync35 } from "fs";
 import { basename as basename8, join as join30 } from "path";
 function captureGit(args2, cwd) {
-  const result = spawnSync5("git", args2, {
+  const result = spawnSync7("git", args2, {
     encoding: "utf-8",
     env: EXEC_ENV,
     cwd: cwd ?? process.cwd()
@@ -9902,13 +9902,16 @@ Exit codes: 0 ok`
 }
 
 // src/cli/commands/bug.ts
-import { execFileSync as execFileSync3, spawnSync as spawnSync2 } from "child_process";
-import { existsSync as existsSync20, readFileSync as readFileSync22 } from "fs";
-import os from "os";
+import { spawnSync as spawnSync3 } from "child_process";
+
+// src/cli/commands/report-shared.ts
 init_version();
 init_platform();
 init_paths();
 init_state();
+import { execFileSync as execFileSync3, spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync20, readFileSync as readFileSync22 } from "fs";
+import os from "os";
 var REPO = "crouton-labs/sisyphus";
 function tryCmd(bin, args2) {
   try {
@@ -9974,8 +9977,8 @@ function tailLog(lines) {
     return null;
   }
 }
-function deriveTitle(description) {
-  const firstLine = description.split("\n").map((l) => l.trim()).find(Boolean) ?? "Bug report";
+function deriveTitle(description, fallback = "Bug report") {
+  const firstLine = description.split("\n").map((l) => l.trim()).find(Boolean) ?? fallback;
   return firstLine.length > 80 ? firstLine.slice(0, 77) + "..." : firstLine;
 }
 function buildBody(args2) {
@@ -9986,7 +9989,7 @@ function buildBody(args2) {
 ---
 
 <details>
-<summary>Environment (auto-collected by <code>sis admin report bug</code>)</summary>
+<summary>Environment (auto-collected)</summary>
 
 | field | value |
 |---|---|
@@ -10028,7 +10031,7 @@ function fallbackUrl(title, body) {
   let b = encodeURIComponent(body);
   if (base.length + t.length + b.length > 7500) {
     b = encodeURIComponent(
-      body.split("\n\n---\n\n")[0] + "\n\n---\n\n_(diagnostics omitted \u2014 URL too long. Authenticate `gh` and re-run `sis admin report bug` to attach full telemetry.)_"
+      body.split("\n\n---\n\n")[0] + "\n\n---\n\n_(diagnostics omitted \u2014 URL too long. Authenticate `gh` and re-run to attach full telemetry.)_"
     );
   }
   return `${base}?title=${t}&body=${b}`;
@@ -10038,6 +10041,8 @@ function ghReady() {
   const auth = spawnSync2("gh", ["auth", "status"], { stdio: "ignore", timeout: 5e3 });
   return auth.status === 0;
 }
+
+// src/cli/commands/bug.ts
 function registerBug(program2) {
   program2.command("bug").description("Report a sisyphus bug \u2014 files a GitHub issue with feedback + diagnostics").argument("[description]", "What went wrong (omit to read from stdin)").option("--message <message>", "Bug description (alternative to the positional argument)").option("--stdin", "Read the description from stdin (avoids shell escaping for long reports)").option("--title <title>", "Issue title (default: first line of the description)").option("--session <id>", "Attach stats for a specific session (default: active session for cwd)").option("--no-session", "Do not attach any session stats").option("--logs [n]", "Attach the last N lines of daemon.log (default 50)").option("--cwd <path>", "Project directory used to find the active session", process.cwd()).addHelpText(
     "after",
@@ -10105,7 +10110,7 @@ Exit codes: 0 ok | 1 filing error | 2 usage`
         emitJsonOk({ url, filed: false });
         return;
       }
-      const result = spawnSync2(
+      const result = spawnSync3(
         "gh",
         ["issue", "create", "--repo", REPO, "--title", title, "--body-file", "-"],
         { input: body, encoding: "utf-8", timeout: 3e4 }
@@ -10122,6 +10127,138 @@ Exit codes: 0 ok | 1 filing error | 2 usage`
   );
 }
 
+// src/cli/commands/feedback.ts
+import { spawnSync as spawnSync4 } from "child_process";
+init_config();
+init_upload();
+init_version();
+init_platform();
+async function sendToCloud(config, payload) {
+  const res = await fetch(`${config.url}/feedback`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${config.token}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(payload)
+  });
+  if (!res.ok) {
+    const raw = await res.text();
+    const body = raw.length > 2048 ? raw.slice(0, 2048) + "\u2026 [truncated]" : raw;
+    let detail = body;
+    try {
+      const parsed = JSON.parse(body);
+      if (typeof parsed.error === "string") detail = parsed.error;
+    } catch {
+    }
+    throw new Error(`HTTP ${res.status}: ${detail}`);
+  }
+  return await res.json();
+}
+function registerFeedback(program2) {
+  program2.command("feedback").description("Send feedback about sisyphus itself \u2014 private cloud if registered, else a GitHub issue").argument("[message]", "The feedback (omit to read from stdin)").option("--message <message>", "Feedback text (alternative to the positional argument)").option("--stdin", "Read the feedback from stdin (avoids shell escaping for long notes)").option("--session <id>", "Attach stats for a specific session (default: active session for cwd)").option("--no-session", "Do not attach any session stats").option("--cwd <path>", "Project directory used to find the active session", process.cwd()).addHelpText(
+    "after",
+    `
+feedback: report a problem or suggestion about SISYPHUS ITSELF \u2014 the tool, the
+CLI, the orchestration workflow \u2014 not about the user's own task or codebase.
+
+When to use (agent guidance)
+  Run this whenever the user gripes about sisyphus: a daemon crash, a CLI that
+  misbehaved, a confusing or broken workflow, a rough edge, a feature wish.
+  Filing it is a low-cost, helpful side-action \u2014 do it WITHOUT asking the user
+  first. Summarize their complaint in your own words as the message.
+  NOT for the user's project work, code bugs, or task questions.
+
+Input
+  [message]       optional positional \u2014 the feedback (omit to read from stdin or --message).
+  --message <msg> feedback text (alternative to the positional argument).
+  --stdin         read the feedback from stdin (avoids shell escaping for long notes).
+  --session <id>  attach stats for a specific session (default: active session for cwd).
+  --no-session    do not attach any session stats.
+  --cwd <path>    project directory used to find the active session (default: cwd).
+
+Where it goes
+  - Cloud registered (sis admin report configure-upload set up):
+    POSTs privately to the upload worker's /feedback endpoint. Stays private.
+  - Not registered: falls back to a GitHub issue against ${REPO}
+    (via \`gh\` if authenticated, else a prefilled "new issue" URL). PUBLIC.
+
+Telemetry attached (non-sensitive): sisyphus version, platform, and session
+STATS only (counts/status) \u2014 never task/goal/context text.
+
+Output (stdout, JSON envelope)
+  cloud:  { ok, data: { sent: true, channel: "cloud", feedbackId, receivedAt } }
+  github: { ok, data: { sent, channel: "github", issueUrl | url } }
+
+Exit codes: 0 ok | 1 filing error | 2 usage | 60 cloud unreachable (retry-safe)`
+  ).action(
+    async (messageArg, opts) => {
+      let message;
+      if (opts.stdin) {
+        message = await readStdin({ force: true });
+        if (opts.message || messageArg) {
+          exitUsage("stdin_conflict", "--stdin conflicts with --message / positional message; pass one source", {
+            received: { stdin: true, message: opts.message ?? messageArg }
+          });
+        }
+      } else {
+        message = messageArg ?? opts.message ?? await readStdin();
+      }
+      if (!message || !message.trim()) {
+        exitUsage("missing_message", "provide feedback (argument, --message, or piped stdin)", {
+          next: 'sis feedback "what is wrong or could be better" \u2014 or: sis feedback --stdin < notes.md'
+        });
+      }
+      message = message.trim();
+      const sessionDisabled = opts.session === false;
+      const session2 = sessionDisabled ? null : await resolveSessionStats(
+        typeof opts.session === "string" ? opts.session : void 0,
+        opts.cwd
+      );
+      const config = loadConfig(opts.cwd);
+      if (isUploadConfigured(config.upload)) {
+        try {
+          const result2 = await sendToCloud(config.upload, {
+            message,
+            sisyphusVersion: getSisyphusVersion(),
+            platform: platformLabel(),
+            session: session2
+          });
+          emitJsonOk({ sent: true, channel: "cloud", ...result2 });
+          return;
+        } catch (err) {
+          exitError({
+            kind: "transient",
+            code: "cloud_unreachable",
+            message: `feedback upload failed: ${err.message}`,
+            next: "retry shortly, or file publicly with `sis admin report bug`"
+          });
+        }
+      }
+      const env = collectEnv();
+      const title = `Feedback: ${deriveTitle(message, "Feedback")}`;
+      const body = buildBody({ description: message, env, session: session2, logTail: null });
+      if (!ghReady()) {
+        emitJsonOk({ sent: false, channel: "github", url: fallbackUrl(title, body) });
+        return;
+      }
+      const result = spawnSync4(
+        "gh",
+        ["issue", "create", "--repo", REPO, "--title", title, "--body-file", "-"],
+        { input: body, encoding: "utf-8", timeout: 3e4 }
+      );
+      if (result.status !== 0) {
+        const url = fallbackUrl(title, body);
+        const stderr = (result.stderr ?? "").trim();
+        emitJsonOk({ sent: false, channel: "github", url, error: stderr });
+        process.exit(1);
+      }
+      const issueUrl = (result.stdout ?? "").trim().split("\n").filter(Boolean).pop() ?? "";
+      emitJsonOk({ sent: true, channel: "github", issueUrl });
+    }
+  );
+}
+
 // src/cli/commands/init.ts
 import { existsSync as existsSync21, mkdirSync as mkdirSync9, writeFileSync as writeFileSync10 } from "fs";
 import { join as join20 } from "path";
@@ -13525,6 +13662,7 @@ var RUBRICS = {
   "companion": { short: "Companion-pane helper", useWhen: "driving the companion Claude pane" },
   "deploy": { short: "Provision cloud boxes (Terraform)", useWhen: "standing up or tearing down infra" },
   "cloud": { short: "Per-repo workflow on a deployed box", useWhen: "syncing work to/from the box" },
+  "feedback": { short: "Report a problem with sisyphus itself", useWhen: "the user complains about the tool or workflow" },
   "session lifecycle": { short: "Start/stop/advance a session", useWhen: "changing whether a session runs" },
   "session inspect": { short: "Read session state", useWhen: "you need status/history/context without mutating" },
   "session config": { short: "Change a session's settings", useWhen: "adjusting task, effort, or dangerous mode" },
@@ -13783,13 +13921,14 @@ registerCompanionProfile(program.commands.find((c) => c.name() === "companion"))
 registerDeploy(program);
 registerDeployList(program.commands.find((c) => c.name() === "deploy"));
 registerCloud(program);
+registerFeedback(program);
 var diagnostic = program.command("diagnostic", { hidden: true });
 attachNotify(diagnostic);
 attachTmuxSessions(diagnostic);
 registerHomeInit(diagnostic);
 var args = process.argv.slice(2);
 var firstArg = args[0];
-var skipWelcome = ["session", "start", "dashboard", "agent", "orch", "ask", "ui", "segment", "admin", "help", "--help", "--version"];
+var skipWelcome = ["session", "start", "dashboard", "agent", "orch", "ask", "ui", "segment", "admin", "feedback", "help", "--help", "--version"];
 if (!existsSync50(globalDir()) && firstArg && !skipWelcome.includes(firstArg)) {
   mkdirSync21(globalDir(), { recursive: true });
   console.log("");