gipity 1.1.3 → 1.1.5

package/dist/updater/shim.js

@@ -38,9 +38,9 @@ function spawnSyncCommand(cmd, args = [], options = {}) {
 }
 
 // src/updater/shim.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 import { fileURLToPath, pathToFileURL } from "url";
-import { dirname, resolve, join as join4 } from "path";
+import { dirname as dirname2, resolve, join as join5 } from "path";
 
 // src/updater/state.ts
 import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
@@ -76,33 +76,96 @@ function writeState(state) {
 }
 
 // src/updater/bootstrap.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, writeFileSync as writeFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync3 } from "fs";
+import { join as join3 } from "path";
+
+// src/updater/install.ts
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, rmSync, statSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { dirname, join as join2 } from "path";
+var UPDATE_LOCK = join2(GIPITY_DIR, "update.lock");
+var LOCK_STALE_MS = 10 * 60 * 1e3;
+function npmInstallGipity(version) {
+  const res = spawnSyncCommand(resolveCommand("npm"), ["install", "--no-audit", "--no-fund", "--ignore-scripts", `gipity@${version}`], {
+    cwd: LOCAL_DIR,
+    stdio: ["ignore", "ignore", "pipe"],
+    encoding: "utf-8"
+  });
+  return {
+    ok: res.status === 0 && existsSync2(LOCAL_ENTRY),
+    status: res.status,
+    stderr: (res.stderr || "").toString(),
+    spawnError: res.error
+  };
+}
+var WEDGE_CODES = /\b(ENOTEMPTY|EEXIST|ENOTDIR|EISDIR|EJSONPARSE)\b/;
+function isWedged(stderr) {
+  return WEDGE_CODES.test(stderr);
+}
+function resetLocalTree(dir = LOCAL_DIR) {
+  mkdirSync2(dir, { recursive: true });
+  rmSync(join2(dir, "node_modules"), { recursive: true, force: true });
+  rmSync(join2(dir, "package-lock.json"), { force: true });
+  writeFileSync2(join2(dir, "package.json"), JSON.stringify({ name: "gipity-local", private: true, version: "0.0.0" }, null, 2));
+}
+function acquireUpdateLock(lockPath = UPDATE_LOCK) {
+  mkdirSync2(dirname(lockPath), { recursive: true });
+  try {
+    writeFileSync2(lockPath, String(process.pid), { flag: "wx" });
+    return true;
+  } catch {
+    try {
+      if (Date.now() - statSync(lockPath).mtimeMs > LOCK_STALE_MS) {
+        unlinkSync(lockPath);
+        writeFileSync2(lockPath, String(process.pid), { flag: "wx" });
+        return true;
+      }
+    } catch {
+    }
+    return false;
+  }
+}
+function releaseUpdateLock(lockPath = UPDATE_LOCK) {
+  try {
+    unlinkSync(lockPath);
+  } catch {
+  }
+}
+
+// src/updater/bootstrap.ts
 function isBootstrapped() {
-  return existsSync2(LOCAL_ENTRY);
+  return existsSync3(LOCAL_ENTRY);
 }
 function bootstrap(version, quiet = false) {
-  mkdirSync2(LOCAL_DIR, { recursive: true });
-  const pkgJsonPath = join2(LOCAL_DIR, "package.json");
-  if (!existsSync2(pkgJsonPath)) {
-    writeFileSync2(pkgJsonPath, JSON.stringify({ name: "gipity-local", private: true, version: "0.0.0" }, null, 2));
+  mkdirSync3(LOCAL_DIR, { recursive: true });
+  const pkgJsonPath = join3(LOCAL_DIR, "package.json");
+  if (!existsSync3(pkgJsonPath)) {
+    writeFileSync3(pkgJsonPath, JSON.stringify({ name: "gipity-local", private: true, version: "0.0.0" }, null, 2));
+  }
+  if (!acquireUpdateLock()) {
+    if (!quiet) process.stderr.write(`gipity: another update is in progress - using the currently installed build.
+`);
+    return false;
   }
   if (!quiet) process.stderr.write(`Setting up gipity local install at ~/.gipity/local (one-time)...
 `);
-  const res = spawnSyncCommand(resolveCommand("npm"), ["install", "--no-audit", "--no-fund", "--ignore-scripts", `gipity@${version}`], {
-    cwd: LOCAL_DIR,
-    stdio: ["ignore", "pipe", "pipe"],
-    encoding: "utf-8"
-  });
-  if (res.status !== 0 || !existsSync2(LOCAL_ENTRY)) {
+  let res;
+  try {
+    res = npmInstallGipity(version);
+    if (!res.ok && !res.spawnError && isWedged(res.stderr)) {
+      resetLocalTree();
+      res = npmInstallGipity(version);
+    }
+  } finally {
+    releaseUpdateLock();
+  }
+  if (!res.ok) {
     if (!quiet) {
-      const stderr = (res.stderr || "").toString();
-      const notPublished = /E404|No matching version|notarget/i.test(stderr);
+      const notPublished = /E404|No matching version|notarget/i.test(res.stderr);
       if (notPublished) {
         process.stderr.write(`gipity v${version} is not yet published to npm - using the currently installed build.
 `);
       } else {
-        const firstLine = stderr.split("\n").map((l) => l.trim()).find((l) => l.length > 0) || (res.error ? res.error.message : `npm exit ${res.status}`);
+        const firstLine = res.stderr.split("\n").map((l) => l.trim()).find((l) => l.length > 0) || (res.spawnError ? res.spawnError.message : `npm exit ${res.status}`);
         const reason = firstLine.length > 160 ? firstLine.slice(0, 157) + "..." : firstLine;
         process.stderr.write(`gipity: could not set up local install (${reason}). Using the currently installed build.
 `);
@@ -119,8 +182,8 @@ function bootstrap(version, quiet = false) {
 }
 
 // src/trace.ts
-import { openSync, writeSync, mkdirSync as mkdirSync3 } from "fs";
-import { join as join3 } from "path";
+import { openSync, writeSync, mkdirSync as mkdirSync4 } from "fs";
+import { join as join4 } from "path";
 import { homedir as homedir2 } from "os";
 var TRACE_KEY = /* @__PURE__ */ Symbol.for("gipity.traceOutput");
 function installOutputTrace(label) {
@@ -132,10 +195,10 @@ function installOutputTrace(label) {
       existing.emit({ event: "reenter", label });
       return;
     }
-    const dir = join3(process.env.GIPITY_DIR || join3(homedir2(), ".gipity"), "trace");
-    mkdirSync3(dir, { recursive: true });
+    const dir = join4(process.env.GIPITY_DIR || join4(homedir2(), ".gipity"), "trace");
+    mkdirSync4(dir, { recursive: true });
     const stamp = (/* @__PURE__ */ new Date()).toISOString().slice(0, 19).replace("T", "_").replace(/:/g, "-");
-    const fd = openSync(join3(dir, `${stamp}-pid${process.pid}.jsonl`), "a");
+    const fd = openSync(join4(dir, `${stamp}-pid${process.pid}.jsonl`), "a");
     const emit = (rec) => {
       try {
         writeSync(fd, JSON.stringify({ t: (/* @__PURE__ */ new Date()).toISOString(), ...rec }) + "\n");
@@ -170,12 +233,12 @@ function installOutputTrace(label) {
 
 // src/updater/shim.ts
 installOutputTrace("shim");
-var __dirname = dirname(fileURLToPath(import.meta.url));
+var __dirname = dirname2(fileURLToPath(import.meta.url));
 var pkgRoot = resolve(__dirname, "..", "..");
-var shimPkg = JSON.parse(readFileSync2(join4(pkgRoot, "package.json"), "utf-8"));
-var isDevLink = existsSync3(join4(pkgRoot, "src"));
+var shimPkg = JSON.parse(readFileSync2(join5(pkgRoot, "package.json"), "utf-8"));
+var isDevLink = existsSync4(join5(pkgRoot, "src"));
 function startBackgroundUpdater() {
-  const checkScript = join4(__dirname, "check.js");
+  const checkScript = join5(__dirname, "check.js");
   try {
     const child = spawnCommand(process.execPath, [checkScript], {
       detached: true,

package/dist/utils.js

@@ -1,5 +1,62 @@
 import { createInterface } from 'readline';
+import { readFileSync, readdirSync, realpathSync, statSync } from 'node:fs';
+import { basename, join } from 'node:path';
 import { bold, dim } from './colors.js';
+/** True inside Windows Subsystem for Linux (either env marker or kernel
+ *  string). WSL ships without a systemd user session unless the user opts in
+ *  via /etc/wsl.conf, and Windows-side paths live under /mnt/c. */
+export function isWsl() {
+    if (process.platform !== 'linux')
+        return false;
+    if (process.env.WSL_DISTRO_NAME || process.env.WSL_INTEROP)
+        return true;
+    try {
+        return /microsoft/i.test(readFileSync('/proc/version', 'utf-8'));
+    }
+    catch {
+        return false;
+    }
+}
+const WINDOWS_PSEUDO_USERS = new Set(['All Users', 'Default', 'Default User', 'Public', 'desktop.ini']);
+/** Under WSL, find a same-named project folder on the Windows side
+ *  (C:\Users\<name>\GipityProjects\<dir>) that is NOT the linked project.
+ *  From Windows Explorer that folder looks like "the project", so users drop
+ *  new files there - but nothing syncs from it. Returns the twin's WSL path,
+ *  or null when there is no twin (or no Windows mount at all). */
+export function findWindowsTwinProject(projectRoot, usersBase = '/mnt/c/Users') {
+    try {
+        const name = basename(projectRoot);
+        if (!name)
+            return null;
+        const realRoot = realpathSync(projectRoot);
+        for (const user of readdirSync(usersBase)) {
+            if (WINDOWS_PSEUDO_USERS.has(user))
+                continue;
+            const candidate = join(usersBase, user, 'GipityProjects', name);
+            try {
+                if (!statSync(candidate).isDirectory())
+                    continue;
+                if (realpathSync(candidate) === realRoot)
+                    continue; // the linked project itself lives on /mnt/c
+                return candidate;
+            }
+            catch {
+                // this user has no such folder - keep scanning
+            }
+        }
+    }
+    catch {
+        // usersBase unreadable: not WSL, or no C: mount
+    }
+    return null;
+}
+/** /mnt/c/Users/steve/... -> C:\Users\steve\... for display to a Windows user. */
+export function wslPathToWindows(p) {
+    const m = p.match(/^\/mnt\/([a-z])\/(.*)$/);
+    if (!m)
+        return p;
+    return `${m[1].toUpperCase()}:\\${m[2].replace(/\//g, '\\')}`;
+}
 /** Safely decode a JWT payload without signature validation */
 export function decodeJwtExp(token) {
     try {
@@ -60,8 +117,8 @@ function rerunWithYes() {
  *
  *  - `opts.default` controls which answer Enter / unknown-key selects. Defaults to `'no'`.
  *  - `opts.skip` (or the global `--yes` flag) auto-returns `true`.
- *  - Renders a `[Y/n]` or `[y/N]` hint automatically - callers should NOT append
- *    their own y/N suffix to `question`.
+ *  - Renders a `[Y/n]:` or `[y/N]:` hint automatically - callers should NOT
+ *    append their own y/N suffix (or a trailing `?`/`:`) to `question`.
  *  - In non-TTY environments without `--yes`, returns `false` and prints a hint. */
 export async function confirm(question, opts = {}) {
     const defaultYes = opts.default === 'yes';
@@ -75,7 +132,7 @@ export async function confirm(question, opts = {}) {
         return false;
     }
     const hint = defaultYes ? dim('[Y/n]') : dim('[y/N]');
-    process.stdout.write(`${question} ${hint} `);
+    process.stdout.write(`${question} ${hint}: `);
     const { stdin } = process;
     const wasRaw = stdin.isRaw ?? false;
     stdin.setRawMode(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gipity",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "The full-stack platform tuned for AI agents. Database, storage, auth, functions, deploy, and drop-in kits - all agent-tuned. Pair with Claude Code or use standalone.",
   "bin": {
     "gipity": "dist/updater/shim.js",
@@ -14,7 +14,7 @@
     "prepack": "npm run build",
     "dev": "tsc --watch",
     "test": "npm run test:smoke",
-    "test:smoke": "npm run build && node --test dist/__tests__/utils.test.js dist/__tests__/platform.test.js dist/__tests__/colors.test.js dist/__tests__/config.test.js dist/__tests__/sync.test.js dist/__tests__/sync-apply.test.js dist/__tests__/sync-unretrievable.test.js dist/__tests__/sync-clean-check.test.js dist/__tests__/sync-lock.test.js dist/__tests__/auth-lock.test.js dist/__tests__/api-401-retry.test.js dist/__tests__/push-cas.test.js dist/__tests__/upload.test.js dist/__tests__/progress.test.js dist/__tests__/updater.test.js dist/__tests__/cli-smoke.test.js dist/__tests__/claude-noninteractive.test.js dist/__tests__/claude-trust.test.js dist/__tests__/relay-state.test.js dist/__tests__/relay-daemon.test.js dist/__tests__/session-pool.test.js dist/__tests__/relay-diagnostics.test.js dist/__tests__/relay-installers.test.js dist/__tests__/relay-bridge-abort.test.js dist/__tests__/relay-redact.test.js dist/__tests__/relay-machine-id.test.js dist/__tests__/stream-json.test.js dist/__tests__/ingest-queue.test.js dist/__tests__/media-upload.test.js dist/__tests__/stream-delta.test.js dist/__tests__/phase-tracker.test.js dist/__tests__/relay-ingest-contract.test.js dist/__tests__/prompts.test.js dist/__tests__/capture-transcript.test.js dist/__tests__/capture-parsers.test.js dist/__tests__/agents.test.js dist/__tests__/capture-lock.test.js dist/__tests__/capture-resolve.test.js dist/__tests__/flag-aliases.test.js dist/__tests__/client-context.test.js dist/__tests__/adopt-cwd.test.js dist/__tests__/cli-cmd-agent.test.js dist/__tests__/cli-cmd-approval.test.js dist/__tests__/cli-cmd-audit.test.js dist/__tests__/cli-cmd-bug.test.js dist/__tests__/cli-cmd-bug-queue.test.js dist/__tests__/cli-cmd-chat.test.js dist/__tests__/cli-cmd-credits.test.js dist/__tests__/cli-cmd-db.test.js dist/__tests__/cli-cmd-deploy.test.js dist/__tests__/cli-cmd-domain.test.js dist/__tests__/cli-cmd-email.test.js dist/__tests__/cli-cmd-file.test.js dist/__tests__/cli-cmd-storage.test.js dist/__tests__/cli-cmd-fn.test.js dist/__tests__/cli-cmd-service.test.js dist/__tests__/cli-cmd-job.test.js dist/__tests__/cli-cmd-generate.test.js dist/__tests__/cli-cmd-gmail.test.js dist/__tests__/cli-cmd-info.test.js dist/__tests__/cli-cmd-init.test.js dist/__tests__/cli-cmd-location.test.js dist/__tests__/cli-cmd-text.test.js dist/__tests__/cli-cmd-login.test.js dist/__tests__/cli-cmd-logout.test.js dist/__tests__/cli-cmd-token.test.js dist/__tests__/cli-cmd-logs.test.js dist/__tests__/cli-cmd-memory.test.js dist/__tests__/cli-cmd-page.test.js dist/__tests__/cli-cmd-plan.test.js dist/__tests__/cli-cmd-project.test.js dist/__tests__/cli-cmd-rbac.test.js dist/__tests__/cli-cmd-realtime.test.js dist/__tests__/cli-cmd-records.test.js dist/__tests__/cli-cmd-relay.test.js dist/__tests__/cli-cmd-setup.test.js dist/__tests__/cli-cmd-doctor.test.js dist/__tests__/claude-setup.test.js dist/__tests__/cli-cmd-sandbox.test.js dist/__tests__/cli-cmd-add.test.js dist/__tests__/cli-cmd-remove.test.js dist/__tests__/cli-cmd-skill.test.js dist/__tests__/cli-cmd-test.test.js dist/__tests__/cli-cmd-workflow.test.js dist/__tests__/setup-skills-block.test.js dist/__tests__/setup-hooks.test.js dist/__tests__/setup-codex-hooks.test.js dist/__tests__/trace.test.js",
+    "test:smoke": "npm run build && node --test dist/__tests__/utils.test.js dist/__tests__/platform.test.js dist/__tests__/colors.test.js dist/__tests__/config.test.js dist/__tests__/sync.test.js dist/__tests__/sync-apply.test.js dist/__tests__/sync-unretrievable.test.js dist/__tests__/sync-clean-check.test.js dist/__tests__/sync-lock.test.js dist/__tests__/auth-lock.test.js dist/__tests__/api-401-retry.test.js dist/__tests__/push-cas.test.js dist/__tests__/upload.test.js dist/__tests__/progress.test.js dist/__tests__/updater.test.js dist/__tests__/cli-smoke.test.js dist/__tests__/claude-noninteractive.test.js dist/__tests__/claude-trust.test.js dist/__tests__/build-picker.test.js dist/__tests__/relay-state.test.js dist/__tests__/relay-daemon.test.js dist/__tests__/session-pool.test.js dist/__tests__/relay-diagnostics.test.js dist/__tests__/relay-installers.test.js dist/__tests__/relay-bridge-abort.test.js dist/__tests__/relay-redact.test.js dist/__tests__/relay-machine-id.test.js dist/__tests__/stream-json.test.js dist/__tests__/ingest-queue.test.js dist/__tests__/media-upload.test.js dist/__tests__/stream-delta.test.js dist/__tests__/phase-tracker.test.js dist/__tests__/relay-ingest-contract.test.js dist/__tests__/prompts.test.js dist/__tests__/capture-transcript.test.js dist/__tests__/capture-parsers.test.js dist/__tests__/agents.test.js dist/__tests__/capture-lock.test.js dist/__tests__/capture-resolve.test.js dist/__tests__/flag-aliases.test.js dist/__tests__/client-context.test.js dist/__tests__/adopt-cwd.test.js dist/__tests__/cli-cmd-agent.test.js dist/__tests__/cli-cmd-approval.test.js dist/__tests__/cli-cmd-audit.test.js dist/__tests__/cli-cmd-bug.test.js dist/__tests__/cli-cmd-bug-queue.test.js dist/__tests__/cli-cmd-chat.test.js dist/__tests__/cli-cmd-credits.test.js dist/__tests__/cli-cmd-db.test.js dist/__tests__/cli-cmd-deploy.test.js dist/__tests__/cli-cmd-domain.test.js dist/__tests__/cli-cmd-email.test.js dist/__tests__/cli-cmd-file.test.js dist/__tests__/cli-cmd-storage.test.js dist/__tests__/cli-cmd-fn.test.js dist/__tests__/cli-cmd-service.test.js dist/__tests__/cli-cmd-job.test.js dist/__tests__/cli-cmd-generate.test.js dist/__tests__/cli-cmd-gmail.test.js dist/__tests__/cli-cmd-info.test.js dist/__tests__/cli-cmd-init.test.js dist/__tests__/cli-cmd-location.test.js dist/__tests__/cli-cmd-text.test.js dist/__tests__/cli-cmd-login.test.js dist/__tests__/cli-cmd-status.test.js dist/__tests__/cli-cmd-logout.test.js dist/__tests__/cli-cmd-token.test.js dist/__tests__/cli-cmd-logs.test.js dist/__tests__/cli-cmd-memory.test.js dist/__tests__/cli-cmd-page.test.js dist/__tests__/cli-cmd-plan.test.js dist/__tests__/cli-cmd-project.test.js dist/__tests__/cli-cmd-rbac.test.js dist/__tests__/cli-cmd-realtime.test.js dist/__tests__/cli-cmd-records.test.js dist/__tests__/cli-cmd-relay.test.js dist/__tests__/cli-cmd-setup.test.js dist/__tests__/cli-cmd-doctor.test.js dist/__tests__/claude-setup.test.js dist/__tests__/cli-cmd-sandbox.test.js dist/__tests__/cli-cmd-add.test.js dist/__tests__/cli-cmd-remove.test.js dist/__tests__/cli-cmd-skill.test.js dist/__tests__/cli-cmd-test.test.js dist/__tests__/cli-cmd-workflow.test.js dist/__tests__/setup-skills-block.test.js dist/__tests__/setup-hooks.test.js dist/__tests__/setup-codex-hooks.test.js dist/__tests__/trace.test.js",
     "test:smoke:quick": "node scripts/smoke-quick.mjs",
     "test:e2e": "tsc && GIPITY_E2E=1 node --test --test-timeout=180000 dist/__tests__/cli-e2e-live.test.js dist/__tests__/cli-e2e-sync-live.test.js dist/__tests__/cli-e2e-sync-stress-live.test.js dist/__tests__/cli-e2e-rollback-live.test.js dist/__tests__/cli-e2e-services-media-live.test.js dist/__tests__/cli-e2e-workflow-live.test.js dist/__tests__/cli-e2e-sandbox-live.test.js dist/__tests__/cli-e2e-page-fetch-live.test.js dist/__tests__/cli-e2e-page-test-live.test.js",
     "test:e2e:sync": "tsc && GIPITY_E2E=1 node --test --test-timeout=180000 dist/__tests__/cli-e2e-sync-live.test.js",