gipity 1.0.264 → 1.0.306

package/dist/commands/chat.js

@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 import { post } from '../api.js';
 import { resolveProjectContext, saveConfig } from '../config.js';
-import { syncDown } from '../sync.js';
+import { sync } from '../sync.js';
 import { error as clrError, muted } from '../colors.js';
 export const chatCommand = new Command('chat')
     .description('Send a message to the Gipity agent')
@@ -27,14 +27,14 @@ export const chatCommand = new Command('chat')
         let syncSummary = '';
         let syncChanges = [];
         if (res.data.filesChanged) {
-            const syncResult = await syncDown();
-            if (syncResult.pulled > 0) {
-                syncSummary = `\nPulled ${syncResult.pulled} file${syncResult.pulled > 1 ? 's' : ''}:\n${syncResult.summary}`;
+            const syncResult = await sync({ interactive: false });
+            if (syncResult.applied > 0) {
+                syncSummary = `\nSynced ${syncResult.applied} change${syncResult.applied > 1 ? 's' : ''}:\n${syncResult.summary}`;
             }
-            syncChanges = syncResult.changes.map(c => ({
-                path: c.path,
-                type: c.type,
-                ...(c.remoteSize != null ? { size: c.remoteSize } : {}),
+            syncChanges = syncResult.plan.actions.map(a => ({
+                path: a.path,
+                type: a.kind,
+                ...(a.remoteSize != null ? { size: a.remoteSize } : {}),
             }));
         }
         if (opts.json) {

package/dist/commands/chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAExD,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,oCAAoC,CAAC;KACjD,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;KACxC,MAAM,CAAC,OAAO,EAAE,0BAA0B,CAAC;KAC3C,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;KAClC,MAAM,CAAC,KAAK,EAAE,OAAe,EAAE,IAAI,EAAE,EAAE;IACtC,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,qBAAqB,EAAE,CAAC;QAEjD,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QAEzD,MAAM,QAAQ,GAAG,WAAW;YAC1B,CAAC,CAAC,kBAAkB,MAAM,CAAC,gBAAgB,WAAW;YACtD,CAAC,CAAC,gBAAgB,CAAC;QAErB,MAAM,IAAI,GAAG,WAAW;YACtB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE;YACvD,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QAEvF,MAAM,GAAG,GAAG,MAAM,IAAI,CAkBnB,QAAQ,EAAE,IAAI,CAAC,CAAC;QAEnB,wCAAwC;QACxC,IAAI,GAAG,CAAC,IAAI,CAAC,gBAAgB,KAAK,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC1D,UAAU,CAAC,EAAE,GAAG,MAAM,EAAE,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACzE,CAAC;QAED,kDAAkD;QAClD,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,WAAW,GAAoD,EAAE,CAAC;QAEtE,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YACtD,IAAI,UAAU,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBAC3B,WAAW,GAAG,YAAY,UAAU,CAAC,OAAO,UAAU,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;YACpH,CAAC;YACD,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9C,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,CAAC,CAAC,CAAC;QACN,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC;gBACzB,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO;gBACzB,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACvC,IAAI,EAAE,CAAC,CAAC,QAAQ;oBAChB,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,MAAM,EAAE,CAAC,CAAC,aAAa,IAAI,EAAE;iBAC9B,CAAC,CAAC,IAAI,EAAE;gBACT,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK;gBACrB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,YAAY;gBACpD,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO;gBACtB,gBAAgB,EAAE,GAAG,CAAC,IAAI,CAAC,gBAAgB;gBAC3C,WAAW,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC;gBACnC,WAAW,EAAE,WAAW;aACzB,CAAC,CAAC,CAAC;QACN,CAAC;aAAM,CAAC;YACN,sBAAsB;YACtB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE9B,kBAAkB;YAClB,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxE,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,QAAQ,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9D,CAAC;YAED,oBAAoB;YACpB,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/commands/claude.js

@@ -1,7 +1,8 @@
 import { Command } from 'commander';
-import { join, dirname, resolve } from 'path';
+import { join, dirname, resolve, basename } from 'path';
 import { mkdirSync, readFileSync, readdirSync, statSync } from 'fs';
 import { execSync, spawn } from 'child_process';
+import { homedir } from 'os';
 import { fileURLToPath } from 'url';
 /** On Windows, spawn without shell:true needs an explicit extension (.exe or .cmd) */
 function resolveCommand(cmd) {
@@ -19,14 +20,15 @@ function resolveCommand(cmd) {
 import { getAuth, saveAuth, clearAuth } from '../auth.js';
 import { get, post, publicPost, ApiError, getAccountSlug } from '../api.js';
 import { getConfig, saveConfig, clearConfigCache, getApiBaseOverride } from '../config.js';
-import { syncDown, syncUp } from '../sync.js';
-import { slugify, setupClaudeHooks, setupClaudeMd, setupGitignore, DEFAULT_SYNC_IGNORE, isSyncIgnored } from '../setup.js';
+import { sync } from '../sync.js';
+import { slugify, setupClaudeHooks, setupClaudeMd, setupAgentsMd, setupGitignore, DEFAULT_SYNC_IGNORE, isSyncIgnored } from '../setup.js';
 import { buildProjectContextBlock as buildProjectContextBlockText, buildExistingProjectPrompt as buildExistingProjectPromptText, buildNewProjectPrompt, buildResumeWrap, buildFreshWrap, } from '../prompts.js';
 import * as relayState from '../relay/state.js';
 import { maybeOfferRelayOn, ensureDaemonRunning } from '../relay/onboarding.js';
-import { prompt, promptBoxed, pickOne, decodeJwtExp } from '../utils.js';
+import { prompt, promptBoxed, pickOne, decodeJwtExp, confirm } from '../utils.js';
 import { brand, bold, info, success, error as clrError, muted } from '../colors.js';
 import { printBanner } from '../banner.js';
+import { scanForAdoption, isLikelyEmpty, canAdoptCwd, formatCwdLabel, formatBytes, adoptCurrentDir, ADOPT_THRESHOLDS, } from '../adopt-cwd.js';
 const __clDir = dirname(fileURLToPath(import.meta.url));
 const __clPkg = JSON.parse(readFileSync(resolve(__clDir, '../../package.json'), 'utf-8'));
 import { getProjectsRoot } from '../relay/paths.js';
@@ -108,6 +110,33 @@ async function buildExistingProjectPrompt(opts) {
     const stats = await fetchProjectStats(opts.projectGuid, opts.cwd);
     return buildExistingProjectPromptText({ ...opts, ...stats });
 }
+/** Interactive email+code login flow. Used on first login and when the
+ *  server returns 401 mid-command (session expired). Writes the new auth
+ *  to disk and returns it. */
+async function interactiveLogin() {
+    const email = await prompt('  Email: ');
+    if (!email) {
+        console.error(`\n  ${clrError('Email required.')}`);
+        process.exit(1);
+    }
+    await publicPost('/auth/login', { email });
+    console.log('  Check your email for a 6-digit code.\n');
+    const code = await prompt('  Code: ');
+    if (!code) {
+        console.error(`\n  ${clrError('Code required.')}`);
+        process.exit(1);
+    }
+    const res = await publicPost('/auth/verify', { email, code });
+    const exp = decodeJwtExp(res.accessToken);
+    if (!exp) {
+        console.error(`\n  ${clrError('Invalid token received.')}`);
+        process.exit(1);
+    }
+    const expiresAt = new Date(exp * 1000).toISOString();
+    saveAuth({ accessToken: res.accessToken, refreshToken: res.refreshToken, email, expiresAt });
+    console.log(`  ${success(`Logged in as ${email}`)}`);
+    return getAuth();
+}
 // First-run relay onboarding now lives in `relay/onboarding.ts`
 // (`maybeOfferRelayOn`). `gipity claude` invokes it after project
 // selection, and also calls `ensureDaemonRunning` unconditionally before
@@ -139,7 +168,7 @@ function suggestProjectName(existingSlugs) {
     return `project-${Date.now().toString(36).slice(-6)}`;
 }
 export const claudeCommand = new Command('claude')
-    .description('Log in, pair this machine, set up a project, and launch Claude Code (pass -p "msg" / --resume <id> for non-interactive use)')
+    .description('Setup and pair with Claude Code (local CLI)')
     .option('--no-claude', 'Set up project but skip launching Claude Code')
     .allowUnknownOption(true)
     .allowExcessArguments(true)
@@ -177,28 +206,7 @@ export const claudeCommand = new Command('claude')
         }
         else {
             console.log('  Let\'s get you logged in.\n');
-            const email = await prompt('  Email: ');
-            if (!email) {
-                console.error(`\n  ${clrError('Email required.')}`);
-                process.exit(1);
-            }
-            await publicPost('/auth/login', { email });
-            console.log('  Check your email for a 6-digit code.\n');
-            const code = await prompt('  Code: ');
-            if (!code) {
-                console.error(`\n  ${clrError('Code required.')}`);
-                process.exit(1);
-            }
-            const res = await publicPost('/auth/verify', { email, code });
-            const exp = decodeJwtExp(res.accessToken);
-            if (!exp) {
-                console.error(`\n  ${clrError('Invalid token received.')}`);
-                process.exit(1);
-            }
-            const expiresAt = new Date(exp * 1000).toISOString();
-            saveAuth({ accessToken: res.accessToken, refreshToken: res.refreshToken, email, expiresAt });
-            auth = getAuth();
-            console.log(`  ${success(`Logged in as ${email}`)}`);
+            auth = await interactiveLogin();
         }
         console.log('');
         // ── Step 1b: Relay first-run onboarding (account-scoped, runs before project) ──
@@ -217,15 +225,12 @@ export const claudeCommand = new Command('claude')
             console.log(`  ${success('Already set up.')}\n`);
             setupClaudeHooks();
             setupClaudeMd();
+            setupAgentsMd();
             setupGitignore();
             try {
-                const upResult = await syncUp();
-                if (upResult.pushed > 0) {
-                    console.log(`  Pushed ${upResult.pushed} file${upResult.pushed > 1 ? 's' : ''} to Gipity.`);
-                }
-                const downResult = await syncDown({ confirmDeletions: !nonInteractive });
-                if (downResult.pulled > 0) {
-                    console.log(`  Pulled ${downResult.pulled} file${downResult.pulled > 1 ? 's' : ''} from Gipity.`);
+                const result = await sync({ interactive: !nonInteractive });
+                if (result.applied > 0) {
+                    console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
                 }
             }
             catch {
@@ -240,91 +245,129 @@ export const claudeCommand = new Command('claude')
             });
         }
         else {
-            // Fetch user's projects
+            // Fetch user's projects. If the session expired (401), re-run the
+            // interactive login and retry once — no reason to kick the user out
+            // to a shell just to re-run the same command.
             let projects = [];
-            try {
-                const res = await get('/projects?limit=100');
-                projects = res.data;
-            }
-            catch (err) {
-                const isConnectionError = err?.code === 'ECONNREFUSED' || err?.code === 'ENOTFOUND' ||
-                    err?.code === 'ETIMEDOUT' || err?.cause?.code === 'ECONNREFUSED' ||
-                    err?.cause?.code === 'ENOTFOUND' || err?.cause?.code === 'ETIMEDOUT';
-                if (isConnectionError) {
-                    const apiBase = getApiBaseOverride() || 'https://a.gipity.ai';
-                    console.error(`  ${clrError(`Could not connect to ${apiBase}`)}`);
-                    console.error(`  ${muted('Check your connection and try again.')}`);
-                    process.exit(1);
+            let reauthed = false;
+            while (true) {
+                try {
+                    const res = await get('/projects?limit=100');
+                    projects = res.data;
+                    break;
                 }
-                if (err instanceof ApiError && err.statusCode === 401) {
-                    clearAuth();
-                    console.error(`  ${clrError('Your session expired.')}`);
-                    console.error(`  ${muted('Run: gipity login')}`);
+                catch (err) {
+                    const isConnectionError = err?.code === 'ECONNREFUSED' || err?.code === 'ENOTFOUND' ||
+                        err?.code === 'ETIMEDOUT' || err?.cause?.code === 'ECONNREFUSED' ||
+                        err?.cause?.code === 'ENOTFOUND' || err?.cause?.code === 'ETIMEDOUT';
+                    if (isConnectionError) {
+                        const apiBase = getApiBaseOverride() || 'https://a.gipity.ai';
+                        console.error(`  ${clrError(`Could not connect to ${apiBase}`)}`);
+                        console.error(`  ${muted('Check your connection and try again.')}`);
+                        process.exit(1);
+                    }
+                    if (err instanceof ApiError && err.statusCode === 401 && !reauthed && !nonInteractive) {
+                        clearAuth();
+                        console.log(`  ${muted('Your session expired. Let\'s sign you back in.')}\n`);
+                        auth = await interactiveLogin();
+                        console.log('');
+                        reauthed = true;
+                        continue;
+                    }
+                    if (err instanceof ApiError && err.statusCode === 401) {
+                        clearAuth();
+                        console.error(`  ${clrError('Your session expired.')}`);
+                        console.error(`  ${muted('Run: gipity login')}`);
+                        process.exit(1);
+                    }
+                    console.error(`  ${clrError(`Could not load projects: ${err?.message || err}`)}`);
                     process.exit(1);
                 }
-                console.error(`  ${clrError(`Could not load projects: ${err?.message || err}`)}`);
-                process.exit(1);
             }
             const existingSlugs = projects.map(p => p.slug);
             let project;
             let isNewProject = false;
-            if (projects.length > 0) {
-                const result = await pickOrCreateProject(projects, existingSlugs);
-                project = result.project;
-                isNewProject = result.isNew;
-            }
-            else {
-                project = await createNewProject(existingSlugs);
-                isNewProject = true;
-            }
-            // Resolve project directory under ~/GipityProjects/{slug}
-            const projectDir = join(getProjectsRoot(), project.slug);
-            mkdirSync(projectDir, { recursive: true });
-            process.chdir(projectDir);
-            clearConfigCache();
-            // Fetch agents
+            let accountSlug = '';
             let agentGuid = '';
-            try {
-                const agents = await get(`/projects/${project.short_guid}/agents`);
-                if (agents.data.length > 0)
-                    agentGuid = agents.data[0].short_guid;
-            }
-            catch {
-                // No agents
+            const result = projects.length > 0
+                ? await pickOrCreateProject(projects, existingSlugs)
+                : { kind: 'create-new', project: await createNewProject(existingSlugs) };
+            if (result.kind === 'adopt-cwd') {
+                // User chose "Use this directory" — derive a slug from the cwd
+                // basename, find-or-create the server project, write
+                // .gipity.json into cwd (no projects-root materialization).
+                const cwdBase = basename(process.cwd());
+                const adoptSlug = slugify(cwdBase) || 'project';
+                const adoptName = cwdBase || adoptSlug;
+                accountSlug = await getAccountSlug();
+                const adopted = await adoptCurrentDir({
+                    cwd: process.cwd(),
+                    projectName: adoptName,
+                    projectSlug: adoptSlug,
+                    accountSlug,
+                    confirmDeletions: !nonInteractive,
+                });
+                project = adopted.project;
+                agentGuid = adopted.agentGuid;
+                // Treat as "new project" for the build prompt only when cwd is
+                // genuinely empty — otherwise the user has chosen to adopt
+                // existing content and shouldn't be asked "what to build?".
+                isNewProject = isLikelyEmpty(process.cwd());
+                console.log(`\n  Using ${process.cwd()}`);
+                if (adopted.applied > 0) {
+                    console.log(`  Synced ${adopted.applied} change${adopted.applied > 1 ? 's' : ''} with Gipity.`);
+                }
             }
-            const accountSlug = await getAccountSlug();
-            // Always write config (refresh stale GUIDs from a previous setup)
-            saveConfig({
-                projectGuid: project.short_guid,
-                projectSlug: project.slug,
-                accountSlug,
-                agentGuid,
-                conversationGuid: null,
-                apiBase: getApiBaseOverride() || 'https://a.gipity.ai',
-                ignore: DEFAULT_SYNC_IGNORE,
-            });
-            console.log(`\n  Using ${projectDir}`);
-            // Sync: push local files up first, then pull any remote-only files down (non-fatal)
-            try {
-                const upResult = await syncUp();
-                if (upResult.pushed > 0) {
-                    console.log(`  Pushed ${upResult.pushed} file${upResult.pushed > 1 ? 's' : ''} to Gipity.`);
+            else {
+                project = result.project;
+                isNewProject = result.kind === 'create-new';
+                // Resolve project directory under ~/GipityProjects/{slug}
+                const projectDir = join(getProjectsRoot(), project.slug);
+                mkdirSync(projectDir, { recursive: true });
+                process.chdir(projectDir);
+                clearConfigCache();
+                // Fetch agents
+                try {
+                    const agents = await get(`/projects/${project.short_guid}/agents`);
+                    if (agents.data.length > 0)
+                        agentGuid = agents.data[0].short_guid;
                 }
-                const downResult = await syncDown({ confirmDeletions: !nonInteractive });
-                if (downResult.pulled > 0) {
-                    console.log(`  Pulled ${downResult.pulled} file${downResult.pulled > 1 ? 's' : ''} from Gipity.`);
+                catch {
+                    // No agents
+                }
+                accountSlug = await getAccountSlug();
+                // Always write config (refresh stale GUIDs from a previous setup)
+                saveConfig({
+                    projectGuid: project.short_guid,
+                    projectSlug: project.slug,
+                    accountSlug,
+                    agentGuid,
+                    conversationGuid: null,
+                    apiBase: getApiBaseOverride() || 'https://a.gipity.ai',
+                    ignore: DEFAULT_SYNC_IGNORE,
+                });
+                console.log(`\n  Using ${projectDir}`);
+                // Unified sync — push and pull resolved via three-way merge (non-fatal)
+                try {
+                    const result = await sync({ interactive: !nonInteractive });
+                    if (result.applied > 0) {
+                        console.log(`  Synced ${result.applied} change${result.applied > 1 ? 's' : ''} with Gipity.`);
+                    }
+                }
+                catch {
+                    console.log('  Could not sync files (will retry on next prompt).');
                 }
-            }
-            catch {
-                console.log('  Could not sync files (will retry on next prompt).');
             }
             // ── Step 2b: What do you want to build? (new projects only) ────
             if (isNewProject) {
                 console.log('');
-                console.log(`  ${bold('What would you like to build?')}`);
-                console.log(`  ${muted('Examples: a landing page, a Pac-Man game, a helpdesk app,')}`);
-                console.log(`  ${muted('an API that returns random facts, or anything you can describe.')}`);
-                console.log(`  ${muted('Press Enter for a blank project.')}`);
+                console.log(`  ${bold('Claude Code enabled with Gipity!')}`);
+                console.log('');
+                console.log(`  ${bold("What's next? What would you like to build?")}`);
+                console.log(`  ${muted('Examples: a landing page, a Pac-Man game, a full web app,')}`);
+                console.log(`  ${muted('an API that returns random facts, an image, just answer questions?')}`);
+                console.log('');
+                console.log(`  ${muted('Claude Code with Gipity can do everything your old Claude Code could do but so much more now!')}`);
                 console.log('');
                 const buildIdea = (await promptBoxed()).trim();
                 const stats = await fetchProjectStats(project.short_guid, process.cwd());
@@ -349,6 +392,7 @@ export const claudeCommand = new Command('claude')
             }
             setupClaudeHooks();
             setupClaudeMd();
+            setupAgentsMd();
             setupGitignore();
             console.log(`  ${success(`Project "${project.name}" ready.`)}\n`);
         }
@@ -384,6 +428,13 @@ export const claudeCommand = new Command('claude')
         // Skipped silently if this machine isn't paired — without a device
         // we can't satisfy the claude_code ownership rule, so hooks stay
         // offline for this run.
+        //
+        // Note: when `--output-format stream-json` is present in argv, the
+        // relay daemon is capturing Claude's stdout directly and the hook-
+        // based transcript capture would double-post every event. In that
+        // case we intentionally do NOT propagate GIPITY_CONVERSATION_GUID
+        // to the Claude child (see childEnv assignment below) — the hook's
+        // existing "no guid → silent no-op" guard then skips capture.
         let convGuidForHooks = process.env.GIPITY_CONVERSATION_GUID ?? null;
         if (!convGuidForHooks) {
             const device = relayState.getDevice();
@@ -403,7 +454,11 @@ export const claudeCommand = new Command('claude')
                         }
                     }
                     if (!convGuidForHooks && cfg?.projectGuid) {
-                        const created = await post('/conversations/claude-code', { project_guid: cfg.projectGuid, device_guid: device.guid });
+                        // Terminal `gipity claude` is always origin='local' — marks the
+                        // conversation as a local-terminal chat so the web CLI renders
+                        // it read-only. Dispatch convs (created by the relay daemon
+                        // spawning `gipity claude -p`) use the default 'dispatch'.
+                        const created = await post('/conversations/claude-code', { project_guid: cfg.projectGuid, device_guid: device.guid, origin: 'local' });
                         convGuidForHooks = created.data.conversation_guid;
                     }
                 }
@@ -488,8 +543,18 @@ export const claudeCommand = new Command('claude')
         // passes args through cmd.exe and mangles quotes/special chars.
         const claudeCmd = resolveCommand('claude');
         const childEnv = { ...process.env };
-        if (convGuidForHooks)
+        // Gate hook-based capture: when the daemon is streaming via
+        // --output-format stream-json, it owns the capture and any hook
+        // post would be a dupe. Leaving GIPITY_CONVERSATION_GUID unset in
+        // the child's env trips the hook runner's early-return guard.
+        const streamJsonIdx = allArgs.indexOf('--output-format');
+        const daemonCapturing = streamJsonIdx !== -1 && allArgs[streamJsonIdx + 1] === 'stream-json';
+        if (daemonCapturing) {
+            delete childEnv.GIPITY_CONVERSATION_GUID;
+        }
+        else if (convGuidForHooks) {
             childEnv.GIPITY_CONVERSATION_GUID = convGuidForHooks;
+        }
         const child = spawn(claudeCmd, allArgs, {
             stdio: 'inherit',
             cwd: process.cwd(),
@@ -504,33 +569,103 @@ export const claudeCommand = new Command('claude')
 });
 async function pickOrCreateProject(projects, existingSlugs) {
     const filtered = projects.filter(p => !p.is_default);
-    const recent = filtered.slice(0, 7);
-    const hasMore = filtered.length > 7;
-    console.log(`  ${bold('Choose project to open:')}\n`);
+    const cwd = process.cwd();
+    const showAdopt = canAdoptCwd(cwd);
+    // Reserve slot 1 for "create new", slot 2 for "use this dir" when shown.
+    const reserved = showAdopt ? 2 : 1;
+    // Pickable single-keypress range is 1-9; leave one slot for "Show all"
+    // when there are more projects than fit.
+    const maxRecent = 9 - reserved - 1; // worst case: keep slot 9 free for "show all"
+    const recent = filtered.slice(0, maxRecent);
+    const hasMore = filtered.length > recent.length;
+    // Loop so that a refused/declined adopt-cwd re-shows the picker rather
+    // than dropping the user into a shell.
+    while (true) {
+        const newProjectLabel = formatNewProjectLabel(existingSlugs);
+        console.log(`  ${bold('Choose project to open:')}\n`);
+        console.log(`    ${bold('1.')} Create new project          ${muted(`(${newProjectLabel})`)}`);
+        if (showAdopt) {
+            console.log(`    ${bold('2.')} Use this directory          ${muted(`(${formatCwdLabel(cwd)})`)}`);
+        }
+        recent.forEach((p, i) => console.log(`    ${bold(`${i + reserved + 1}.`)} ${p.name} ${muted(`(${p.slug})`)}`));
+        if (hasMore) {
+            console.log(`    ${bold(`${recent.length + reserved + 1}.`)} Show all projects`);
+        }
+        console.log('');
+        const maxOption = recent.length + reserved + (hasMore ? 1 : 0);
+        const idx = await pickOne('Choose', maxOption, 1);
+        // Recent project (slots reserved+1 .. recent.length+reserved).
+        if (idx > reserved && idx <= recent.length + reserved) {
+            return { kind: 'pick', project: recent[idx - reserved - 1] };
+        }
+        // Show all projects (one past the last recent slot).
+        if (hasMore && idx === recent.length + reserved + 1) {
+            const picked = await pickFromAll(filtered);
+            if (picked)
+                return { kind: 'pick', project: picked };
+            continue; // user bailed; re-show top picker
+        }
+        // Slot 2 = "Use this directory" (only when shown).
+        if (showAdopt && idx === 2) {
+            const ok = await confirmAdoptCwd(cwd);
+            if (!ok) {
+                console.log('');
+                continue;
+            }
+            return { kind: 'adopt-cwd' };
+        }
+        // Default (Enter) or slot 1 = create new project.
+        const project = await createNewProject(existingSlugs);
+        return { kind: 'create-new', project };
+    }
+}
+/** Render "Show all projects" with numbered list; returns the picked
+ *  project or null if the user picked "create new" (slot 1) or invalid. */
+async function pickFromAll(filtered) {
+    console.log('');
+    console.log(`  ${bold('All projects:')}\n`);
     console.log(`    ${bold('1.')} Create new project`);
-    recent.forEach((p, i) => console.log(`    ${bold(`${i + 2}.`)} ${p.name} ${muted(`(${p.slug})`)}`));
-    if (hasMore)
-        console.log(`    ${bold(`${recent.length + 2}.`)} Show all projects`);
+    filtered.forEach((p, i) => console.log(`    ${bold(`${i + 2}.`)} ${p.name} ${muted(`(${p.slug})`)}`));
     console.log('');
-    const maxOption = hasMore ? recent.length + 2 : recent.length + 1;
-    const idx = await pickOne('Choose', maxOption, 1);
-    // Selected a recent project
-    if (idx >= 2 && idx <= recent.length + 1)
-        return { project: recent[idx - 2], isNew: false };
-    // Show all projects
-    if (hasMore && idx === recent.length + 2) {
+    const allChoice = await prompt(`  Choose (1-${filtered.length + 1}): `);
+    const allIdx = parseInt(allChoice, 10);
+    if (allIdx >= 2 && allIdx <= filtered.length + 1)
+        return filtered[allIdx - 2];
+    return null;
+}
+/** Show "(~/GipityProjects/project-NNN)" — the exact dir option 1 will
+ *  create, so the user can see where their new project will land. */
+function formatNewProjectLabel(existingSlugs) {
+    const slug = suggestProjectName(existingSlugs);
+    const root = getProjectsRoot();
+    const home = homedir();
+    const display = root.startsWith(home + '/') || root === home
+        ? '~' + root.slice(home.length)
+        : root;
+    return `${display}/${slug}`;
+}
+/** Run the size-tier scan, surface the right UX:
+ *    - easy   → silent, return true.
+ *    - moderate → confirm prompt with file count + size.
+ *    - refuse → print explanation, return false (caller re-shows picker).
+ *  Returns true if adoption should proceed. */
+async function confirmAdoptCwd(cwd) {
+    process.stdout.write(`  ${muted('Scanning directory...')} `);
+    const scan = scanForAdoption(cwd);
+    process.stdout.write('\r\x1b[K'); // clear the scanning line
+    if (scan.tier === 'refuse') {
+        const sizeStr = scan.truncated ? `>${formatBytes(ADOPT_THRESHOLDS.REFUSE_BYTES)}` : formatBytes(scan.bytes);
+        const fileStr = scan.truncated ? `>${ADOPT_THRESHOLDS.REFUSE_FILES}` : `${scan.files}`;
+        console.log(`  ${clrError(`Directory has ${fileStr} files (${sizeStr}) — too large to adopt as a Gipity project.`)}`);
+        console.log(`  ${muted('Move into a subdirectory, or use option 1 to create a fresh project under ~/GipityProjects/.')}`);
         console.log('');
-        console.log(`  ${bold('All projects:')}\n`);
-        console.log(`    ${bold('1.')} Create new project`);
-        filtered.forEach((p, i) => console.log(`    ${bold(`${i + 2}.`)} ${p.name} ${muted(`(${p.slug})`)}`));
+        return false;
+    }
+    if (scan.tier === 'moderate') {
         console.log('');
-        const allChoice = await prompt(`  Choose (1-${filtered.length + 1}): `);
-        const allIdx = parseInt(allChoice, 10);
-        if (allIdx >= 2 && allIdx <= filtered.length + 1)
-            return { project: filtered[allIdx - 2], isNew: false };
+        return confirm(`  About to adopt ${bold(String(scan.files))} files (${bold(formatBytes(scan.bytes))}) at ${bold(formatCwdLabel(cwd))}. Continue?`, { default: 'yes' });
     }
-    // Default (Enter) or 1 = create new project
-    return { project: await createNewProject(existingSlugs), isNew: true };
+    return true;
 }
 async function createNewProject(existingSlugs) {
     const taken = new Set(existingSlugs);
@@ -553,7 +688,7 @@ async function createNewProject(existingSlugs) {
             suggested = suggestProjectName([...taken]);
             continue;
         }
-        console.log(`  ${info(`Creating "${projectName}"...`)}`);
+        process.stdout.write(`  ${info(`Creating "${projectName}"...`)}`);
         try {
             const device = relayState.getDevice();
             const body = { name: projectName, slug: projectSlug };
@@ -562,11 +697,12 @@ async function createNewProject(existingSlugs) {
                 body.deviceGuid = device.guid;
             }
             const res = await post('/projects', body);
-            console.log(`  ${success('Created.')}`);
+            console.log(` ${success('Created.')}`);
             return res.data;
         }
         catch (err) {
             if (err instanceof ApiError && err.statusCode === 409) {
+                console.log('');
                 console.error(`  ${clrError(`"${projectSlug}" was just taken. Pick a different name.`)}`);
                 taken.add(projectSlug);
                 suggested = suggestProjectName([...taken]);