gipity 1.0.413 → 1.0.416

package/dist/relay/setup.js

@@ -11,7 +11,7 @@
  * and no `process.exit` in this module: callers own all UX.
  */
 import { spawnCommand, spawnSyncCommand } from '../platform.js';
-import { hostname, platform as osPlatform } from 'os';
+import { hostname, userInfo, platform as osPlatform } from 'os';
 import { resolve, dirname } from 'path';
 import { mkdirSync, writeFileSync } from 'fs';
 import { post } from '../api.js';
@@ -24,6 +24,33 @@ export function mapPlatform(p) {
         return p;
     return 'linux';
 }
+/**
+ * A friendly default device name for the web CLI — e.g. "Steve's Mac",
+ * "Steve's Windows PC". Prefers the OS login name + device kind, which reads
+ * better and is more recognizable than a raw hostname like "SignalOrangeXps".
+ * Falls back to the hostname, then a generic label. The user can override at
+ * the prompt, and the server de-dupes collisions ("Steve's Mac-2").
+ */
+export function friendlyDeviceName() {
+    const kind = osPlatform() === 'darwin' ? 'Mac' :
+        osPlatform() === 'win32' ? 'Windows PC' :
+            'Linux PC';
+    let user = '';
+    try {
+        user = (userInfo().username || '').trim();
+    }
+    catch {
+        // userInfo() throws when there's no matching passwd entry (some containers).
+    }
+    // Generic/service accounts carry no signal — the hostname is more useful there.
+    const generic = new Set(['root', 'user', 'admin', 'ubuntu', 'ec2-user', 'administrator', 'pi']);
+    if (user && !generic.has(user.toLowerCase())) {
+        const owner = user.charAt(0).toUpperCase() + user.slice(1);
+        return `${owner}'s ${kind}`;
+    }
+    const host = (hostname() || '').trim();
+    return host || `My ${kind}`;
+}
 /** Absolute path to the currently-running `gipity` CLI. Embedded in service
  *  units so launchd/systemd/Task Scheduler re-launch the same binary even if
  *  PATH changes. */
@@ -59,7 +86,7 @@ export async function pairDevice(opts = {}) {
         }
         state.clearDevice();
     }
-    const name = (opts.name?.trim() || hostname() || 'my-pc').trim();
+    const name = (opts.name?.trim() || friendlyDeviceName()).trim();
     if (!name || name.length > 100) {
         throw new Error('Device name must be 1–100 non-whitespace characters.');
     }

package/dist/relay/state.js

@@ -38,6 +38,7 @@ export function loadState() {
             paused: Boolean(raw.paused),
             relay_enabled: typeof raw.relay_enabled === 'boolean' ? raw.relay_enabled : undefined,
             onboard_shown: Boolean(raw.onboard_shown),
+            diagnostics_consent: typeof raw.diagnostics_consent === 'boolean' ? raw.diagnostics_consent : undefined,
             agent_token: typeof raw.agent_token === 'string' ? raw.agent_token : null,
             agent_token_guid: typeof raw.agent_token_guid === 'string' ? raw.agent_token_guid : null,
         };
@@ -113,6 +114,23 @@ export function isRelayEnabled() {
 export function setRelayEnabled(enabled) {
     mutate(s => { s.relay_enabled = enabled; });
 }
+// ─── Diagnostics consent (tri-state, default-on) ───────────────────────
+/** Stored preference: `undefined` = never asked; `true`/`false` = explicit. */
+export function getDiagnosticsConsent() {
+    return loadState().diagnostics_consent;
+}
+export function setDiagnosticsConsent(consent) {
+    mutate(s => { s.diagnostics_consent = consent; });
+}
+/** Effective consent used by the daemon: default-on unless the user explicitly
+ *  opted out OR a headless opt-out env var (GIPITY_NO_DIAGNOSTICS / DO_NOT_TRACK)
+ *  is set. Truthy env value ("1"/"true"/anything non-empty) disables. */
+export function diagnosticsConsented() {
+    const env = process.env.GIPITY_NO_DIAGNOSTICS ?? process.env.DO_NOT_TRACK;
+    if (env && env !== '0' && env.toLowerCase() !== 'false')
+        return false;
+    return loadState().diagnostics_consent !== false;
+}
 // ─── Daemon PID file (lives at ~/.gipity/relay.pid) ────────────────────
 const RELAY_PID_FILE = join(RELAY_DIR, 'relay.pid');
 export function getDaemonPidPath() {

package/dist/setup.js

@@ -244,27 +244,39 @@ function versionGte(have, want) {
     }
     return true;
 }
-/** True when Claude Code already records a USER-scope install of the Gipity
- *  plugin at >= the version this CLI needs - the common case, letting the
- *  caller skip the (slow) reinstall. Reads installed_plugins.json directly so
- *  the check costs no subprocess. Exported so `gipity status` can tell an
- *  actually-loaded plugin apart from one that's merely enabled-but-uninstalled
- *  (which would otherwise read as a false-green "hooks enabled"). */
-export function userScopePluginCurrent() {
+/** Parsed user-scope install state for the Gipity plugin, read straight from
+ *  installed_plugins.json (no subprocess). `exists` is true when Claude Code
+ *  records ANY user-scope install; `current` narrows that to one at >= the
+ *  version this CLI needs. The two differ exactly when a stale install lags a
+ *  plugin-version bump - the case that must be UPGRADED, not freshly installed
+ *  (a bare `claude plugin install` no-ops on an already-present user install
+ *  and never advances its version). */
+export function userScopeInstallState() {
     try {
         const p = join(homedir(), '.claude', 'plugins', 'installed_plugins.json');
         const data = JSON.parse(readFileSync(p, 'utf-8'));
         const entries = data?.plugins?.[GIPITY_PLUGIN_ID];
         if (!Array.isArray(entries))
-            return false;
-        return entries.some((e) => e?.scope === 'user' &&
-            typeof e?.version === 'string' &&
-            versionGte(e.version, GIPITY_PLUGIN_VERSION));
+            return { exists: false, current: false };
+        const userEntries = entries.filter((e) => e?.scope === 'user');
+        return {
+            exists: userEntries.length > 0,
+            current: userEntries.some((e) => typeof e?.version === 'string' && versionGte(e.version, GIPITY_PLUGIN_VERSION)),
+        };
     }
     catch {
-        return false;
+        return { exists: false, current: false };
     }
 }
+/** True when Claude Code already records a USER-scope install of the Gipity
+ *  plugin at >= the version this CLI needs - the common case, letting the
+ *  caller skip the (slow) reinstall. Reads installed_plugins.json directly so
+ *  the check costs no subprocess. Exported so `gipity status` can tell an
+ *  actually-loaded plugin apart from one that's merely enabled-but-uninstalled
+ *  (which would otherwise read as a false-green "hooks enabled"). */
+export function userScopePluginCurrent() {
+    return userScopeInstallState().current;
+}
 function claudeOnPath() {
     const probe = spawnSyncCommand(process.platform === 'win32' ? 'where' : 'which', ['claude'], {
         encoding: 'utf-8',
@@ -286,22 +298,31 @@ function claudeOnPath() {
  *  never break `gipity claude`. Skips entirely when the user-scope install is
  *  already current, so it shells out at most once per plugin-version bump. */
 export function ensureGipityPluginInstalled() {
-    if (userScopePluginCurrent())
+    const state = userScopeInstallState();
+    if (state.current)
         return;
     if (!claudeOnPath())
         return;
-    // Refresh the marketplace clone so `install` resolves the current version,
-    // then (re)install at user scope - idempotent, and upgrades an older or
-    // project-scoped install to the current one at user scope.
+    // Refresh the marketplace clone so install/update resolves the current version.
     // resolveCommand: on Windows `claude` is a .cmd shim that spawn can't launch
-    // without an explicit path, so resolve it (otherwise the install silently
+    // without an explicit path, so resolve it (otherwise the command silently
     // ENOENTs and the plugin's hooks never land at user scope).
     const claudeCmd = resolveCommand('claude');
     spawnSyncCommand(claudeCmd, ['plugin', 'marketplace', 'update', GIPITY_MARKETPLACE_NAME], {
         stdio: 'ignore',
         timeout: 120_000,
     });
-    spawnSyncCommand(claudeCmd, ['plugin', 'install', GIPITY_PLUGIN_ID, '--scope', 'user'], {
+    // A bare `plugin install` only materializes a MISSING install - on an
+    // already-present but stale user-scope install (the version this CLI just
+    // bumped past) it no-ops and leaves the old version registered, so
+    // userScopePluginCurrent() stays false forever and `gipity status` reports
+    // `missing: install` on every run. `plugin update` is the command that
+    // actually advances a registered user-scope install to the marketplace's
+    // current version; `install` is only right when nothing is installed yet.
+    const verb = state.exists
+        ? ['plugin', 'update', GIPITY_PLUGIN_ID, '--scope', 'user']
+        : ['plugin', 'install', GIPITY_PLUGIN_ID, '--scope', 'user'];
+    spawnSyncCommand(claudeCmd, verb, {
         stdio: 'ignore',
         timeout: 120_000,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gipity",
-  "version": "1.0.413",
+  "version": "1.0.416",
   "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",
@@ -13,7 +13,7 @@
     "postbuild": "node scripts/gen-build-info.mjs",
     "dev": "tsc --watch",
     "test": "npm run test:smoke",
-    "test:smoke": "tsc && 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-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__/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__/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__/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-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",
+    "test:smoke": "tsc && 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-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__/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__/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__/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-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",
     "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",