wave-code 1.3.0 → 1.5.0

package/src/utils/gitCredentialHelper.ts

@@ -0,0 +1,106 @@
+/**
+ * Git credential helper installed for repositories cloned from a `wave://clone`
+ * deep link (spec: docs/specs/desktop/desktop-deep-link.md「克隆出的仓库长期
+ * 自动认证」).
+ *
+ * What lands in the repository config is *this command*, never the credential:
+ *
+ *     [credential]
+ *         helper =
+ *         helper = !exec '/Users/me/.wave/git-credential-wave'
+ *
+ * The empty first entry resets the helper list inherited from system/global
+ * config. Without it a machine-wide store/cache helper (osxkeychain, manager,
+ * credential-store) also runs and pins the first credential it sees, so later
+ * logins and token refreshes would never be picked up.
+ *
+ * The helper is a plain `/bin/sh` script rather than a call back into the CLI:
+ * git invokes it before *every* authenticated network operation, and booting
+ * the Electron-bundled Node runtime for that would add seconds to each push. It
+ * only needs the token sitting in `~/.wave/auth.json`, which the CLI keeps
+ * current (including background refreshes).
+ */
+
+import { chmodSync, mkdirSync, writeFileSync } from "fs";
+import * as path from "path";
+import { AuthService } from "wave-agent-sdk";
+
+/** Extensionless on purpose: git execs it through the shebang, and MSYS sh
+ *  resolves a bare path that starts with `#!`. */
+export const GIT_CREDENTIAL_HELPER_FILENAME = "git-credential-wave";
+
+export interface InstalledGitCredentialHelper {
+  /** Absolute path of the generated script. */
+  path: string;
+  /** Ready-to-use `credential.helper` value (written into repo config). */
+  command: string;
+}
+
+/** `<home>/.wave/git-credential-wave` — next to `auth.json`. */
+export function gitCredentialHelperPath(): string {
+  return path.join(
+    path.dirname(AuthService.getInstance().getAuthPath()),
+    GIT_CREDENTIAL_HELPER_FILENAME,
+  );
+}
+
+/**
+ * (Re)write the helper script and return the config value that installs it.
+ * Idempotent — safe to call on every deep-link clone.
+ */
+export function installGitCredentialHelper(): InstalledGitCredentialHelper {
+  const scriptPath = gitCredentialHelperPath();
+  mkdirSync(path.dirname(scriptPath), { recursive: true });
+  writeFileSync(
+    scriptPath,
+    renderGitCredentialHelper(AuthService.getInstance().getAuthPath()),
+    "utf-8",
+  );
+  chmodSync(scriptPath, 0o755);
+  return { path: scriptPath, command: `!exec ${shellQuote(scriptPath)}` };
+}
+
+/** The script body. Exported for tests. */
+export function renderGitCredentialHelper(authFilePath: string): string {
+  return `#!/bin/sh
+# Wave git credential helper — generated by CodeWave IDE.
+# Rewritten on every deep-link clone; do not edit by hand.
+#
+# Prints the current Wave SSO token, read fresh from the login store on each
+# request, so logging in (or the CLI refreshing the token) takes effect without
+# touching any repository.
+
+AUTH_FILE=${shellQuote(authFilePath)}
+
+# Drain git's request: we only look at the capabilities it advertises below, and
+# a helper that exits before reading stdin can get EPIPE'd.
+input=$(cat 2>/dev/null) || input=
+
+token=$(sed -n 's/.*"SSO_TOKEN"[[:space:]]*:[[:space:]]*"\\([^"]*\\)".*/\\1/p' "$AUTH_FILE" 2>/dev/null | head -n 1)
+
+if [ -z "$token" ]; then
+	# Not logged in on this machine. Stop git right here: quit=true skips the
+	# remaining helpers *and* the interactive prompt (there is no terminal when
+	# the agent runs git), so the operation fails fast instead of hanging.
+	echo "quit=true"
+	exit 0
+fi
+
+case "$input" in
+*capability\\[\\]=authtype*)
+	echo "capability[]=authtype"
+	echo "authtype=bearer"
+	printf 'credential=%s\\n' "$token"
+	;;
+*)
+	echo "username=oauth2"
+	printf 'password=%s\\n' "$token"
+	;;
+esac
+`;
+}
+
+/** Single-quote a value for `sh`, escaping embedded single quotes. */
+export function shellQuote(value: string): string {
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}

package/src/utils/logger.ts

@@ -11,7 +11,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import { Chalk } from "chalk";
-import { getLastLines } from "wave-agent-sdk";
+import { getLastLines, errorReplacer } from "wave-agent-sdk";
 import { LOG_FILE } from "./constants.js";
 
 const chalk = new Chalk({ level: 3 });
@@ -132,7 +132,10 @@ const formatArg = (arg: unknown): string => {
     result = arg.stack || arg.message || String(arg);
   } else if (typeof arg === "object") {
     try {
-      result = JSON.stringify(arg);
+      // The replacer keeps Errors nested inside a payload ({ error: e }) from
+      // serializing to `{}` — the `instanceof` check above only covers args
+      // passed bare.
+      result = JSON.stringify(arg, errorReplacer);
     } catch {
       // If JSON.stringify fails, fallback to String()
       result = String(arg);

package/src/utils/rewindCheckpoints.ts

@@ -2,15 +2,13 @@ import type { Message } from "wave-agent-sdk";
 
 /**
  * 判断一条 user 消息能否作为 /rewind 检查点。
- * 后台任务通知（task_notification）、hook 注入的消息（source: "hook"）
- * 都是系统生成、用户不可见的，不能作为回滚点。bash 模式命令消息
+ * 后台任务通知（task_notification）与 hook 注入的消息都是系统生成、
+ * 用户不可见的（meta），不能作为回滚点。bash 模式命令消息
  * （`!ls`）是用户真正输入，与 fork skill 命令消息一致，可作为回滚点。
  * CLI 交互式选择器与 stdio listRewindCheckpoints 共用此判定，避免两处漂移。
  */
 export function isUserCheckpointMessage(m: Message): boolean {
   if (m.role !== "user" || m.isMeta) return false;
   if (m.blocks.some((b) => b.type === "task_notification")) return false;
-  if (m.blocks.some((b) => b.type === "text" && b.source === "hook"))
-    return false;
   return true;
 }