ftown-bridge 0.19.39 → 0.19.41

package/dist/env-commands.js

@@ -0,0 +1,162 @@
+import { PROVIDER_AUTH_ENV, PROVIDER_FLAVORS, listProviderEnv, removeProviderToken, setProviderToken, } from './provider-env-store.js';
+/** Mask all but the last 4 chars; tokens of length <=4 are fully masked. */
+export function maskToken(value) {
+    if (value.length <= 4)
+        return '****';
+    return `****${value.slice(-4)}`;
+}
+/** Resolve a provider flavor to its source env-var KEY. Throws on unknown. */
+export function resolveProviderSource(provider) {
+    const mapping = PROVIDER_AUTH_ENV[provider];
+    if (!mapping) {
+        throw new Error(`Unknown provider "${provider}" — use one of: ${PROVIDER_FLAVORS.join(', ')}`);
+    }
+    return mapping.source;
+}
+/**
+ * Resolve the token for `set` without exposing it on argv.
+ *
+ * When `positional` is a real value (defined and not the "-" stdin sentinel) it
+ * is used verbatim (trimmed) and `onArgvToken` is invoked so the caller can warn
+ * that an argv token leaks into `ps`/shell history. Otherwise the token is read
+ * from stdin via `readStdin` (piped, keeping it out of `ps` output and shell
+ * history). Throws a clear error when no non-empty token is found.
+ */
+export async function resolveSetToken(positional, readStdin, onArgvToken) {
+    const fromArgv = positional !== undefined && positional !== '-';
+    if (fromArgv)
+        onArgvToken?.();
+    const raw = fromArgv ? positional : await readStdin();
+    const token = (raw ?? '').trim();
+    if (!token) {
+        throw new Error('No token provided — pass it as an argument or pipe it via stdin ' +
+            '(e.g. `printf %s "$TOKEN" | ftown env set <provider> -`)');
+    }
+    return token;
+}
+/** Read all of process.stdin to end, decoded as UTF-8 (trimming is the caller's job). */
+async function readStdin() {
+    const chunks = [];
+    for await (const chunk of process.stdin) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks).toString('utf8');
+}
+/**
+ * Classify each flavor's token: stored in env.json wins over the process env;
+ * a flavor absent from BOTH is "missing" and listed under `blocked`.
+ */
+export function buildDoctorReport(store, processEnv) {
+    const flavors = PROVIDER_FLAVORS.map((flavor) => {
+        const source = PROVIDER_AUTH_ENV[flavor].source;
+        let status;
+        if (store[source])
+            status = 'env.json';
+        else if (processEnv[source])
+            status = 'process-env';
+        else
+            status = 'missing';
+        return { flavor, source, status };
+    });
+    const blocked = flavors.filter((f) => f.status === 'missing').map((f) => f.flavor);
+    return { flavors, blocked };
+}
+/** Positional args, skipping flags and the values of value-taking flags. */
+function positionals(args, valueFlags) {
+    const out = [];
+    for (let i = 0; i < args.length; i++) {
+        const a = args[i];
+        if (a.startsWith('--')) {
+            if (valueFlags.includes(a))
+                i++;
+            continue;
+        }
+        out.push(a);
+    }
+    return out;
+}
+function usage() {
+    console.error(`Usage: ftown env <command> [options]
+
+Commands:
+  set <provider> [token]   Store a machine token for a provider
+  ls                       List configured provider tokens (masked)
+  rm <provider>            Remove a stored provider token
+  doctor                   Report which providers are configured / blocked
+
+Providers: ${PROVIDER_FLAVORS.join(' | ')}
+
+Recommended (keeps the token out of \`ps\` and shell history): omit the token
+positional and read it from stdin —
+  ftown env set zai                        then paste the token and press Ctrl-D
+  printf %s "$TOKEN" | ftown env set zai -  pipe it (the "-" forces stdin)
+
+Tokens live in ~/.ftown/env.json (mode 0o600). Values are always masked on output.`);
+}
+/** Dispatch a single command. Throws on bad input; main() maps that to exit 1. */
+export async function run(argv) {
+    const cmd = argv[0];
+    const rest = argv.slice(1);
+    switch (cmd) {
+        case 'set': {
+            const positional = positionals(rest, []);
+            const provider = positional[0];
+            if (!provider) {
+                throw new Error('Usage: ftown env set <provider> [token]  (omit the token to read it from stdin)');
+            }
+            const source = resolveProviderSource(provider);
+            const token = await resolveSetToken(positional[1], readStdin, () => console.error('ftown env: warning: the token was passed as an argument, which exposes it to ' +
+                '`ps` and shell history. Prefer stdin: `printf %s "$TOKEN" | ftown env set <provider> -`.'));
+            setProviderToken(source, token);
+            console.log(`set ${source} (${maskToken(token)}) for ${provider}`);
+            break;
+        }
+        case 'ls': {
+            const store = listProviderEnv();
+            const keys = Object.keys(store);
+            if (keys.length === 0) {
+                console.log('(no provider tokens configured)');
+                break;
+            }
+            for (const key of keys)
+                console.log(`${key}  ${maskToken(store[key])}`);
+            break;
+        }
+        case 'rm': {
+            const positional = positionals(rest, []);
+            const provider = positional[0];
+            if (!provider)
+                throw new Error('Usage: ftown env rm <provider>');
+            const source = resolveProviderSource(provider);
+            const existed = removeProviderToken(source);
+            console.log(existed ? `removed ${source} for ${provider}` : `${source} (${provider}) was not set`);
+            break;
+        }
+        case 'doctor': {
+            const report = buildDoctorReport(listProviderEnv(), process.env);
+            for (const f of report.flavors) {
+                console.log(`${f.flavor.padEnd(9)} ${f.source.padEnd(20)} ${f.status}`);
+            }
+            console.log(`blocked: ${report.blocked.length ? report.blocked.join(', ') : '(none)'}`);
+            break;
+        }
+        default:
+            usage();
+            throw new Error(cmd ? `Unknown command "${cmd}"` : 'No command given');
+    }
+}
+export async function runEnv(argv) {
+    if (argv.length === 0 || argv[0] === '--help' || argv[0] === '-h') {
+        usage();
+        return argv.length ? 0 : 1;
+    }
+    try {
+        await run(argv);
+        return 0;
+    }
+    catch (error) {
+        console.error(`ftown env: ${error instanceof Error ? error.message : String(error)}`);
+        return 1;
+    }
+}
+//# sourceMappingURL=env-commands.js.map

package/dist/env-commands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"env-commands.js","sourceRoot":"","sources":["../src/env-commands.ts"],"names":[],"mappings":"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"}

package/dist/ftown-cli.d.ts

@@ -1,8 +1,4 @@
 #!/usr/bin/env node
-/**
- * Resolve a subcommand to its absolute sibling launcher path under `ftownDir`.
- * Throws a clear Error (listing the valid subcommands) on undefined/unknown.
- */
-export declare function resolveSubcommandTarget(sub: string | undefined, ftownDir: string): string;
-/** Multi-line usage text listing every routed subcommand. */
+export { isCliEntry } from './cli-entry.js';
 export declare function usage(): string;
+export declare function runFtown(argv: string[]): Promise<number>;

package/dist/ftown-cli.js

@@ -1,91 +1,37 @@
 #!/usr/bin/env node
-/**
- * `ftown` — top-level dispatcher that routes subcommands to the sibling
- * launchers installed by ftown-bridge under ~/.ftown.
- *
- * Installed to ~/.ftown/ftown by ftown-bridge. Imports ONLY node builtins, so
- * no extra sibling copy is needed alongside the compiled CLI. Each subcommand
- * is forwarded verbatim to its dedicated launcher with stdio inherited, and the
- * child's exit code is propagated unchanged.
- */
-import { execFileSync } from 'node:child_process';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { pathToFileURL } from 'node:url';
-const FTOWN_DIR = join(homedir(), '.ftown');
-/** Subcommand -> sibling launcher path (relative to a given ftownDir). */
-const SUBCOMMANDS = ['env', 'sessions', 'workflows', 'harness'];
-function isSubcommand(sub) {
-    return SUBCOMMANDS.includes(sub);
-}
-/**
- * Resolve a subcommand to its absolute sibling launcher path under `ftownDir`.
- * Throws a clear Error (listing the valid subcommands) on undefined/unknown.
- */
-export function resolveSubcommandTarget(sub, ftownDir) {
-    if (sub === undefined || !isSubcommand(sub)) {
-        const got = sub === undefined ? '(none)' : `"${sub}"`;
-        throw new Error(`Unknown subcommand ${got} — use one of: ${SUBCOMMANDS.join(', ')}`);
-    }
-    switch (sub) {
-        case 'env':
-            return join(ftownDir, 'ftown-env');
-        case 'sessions':
-            return join(ftownDir, 'ftown-sessions');
-        case 'workflows':
-            return join(ftownDir, 'ftown-workflows');
-        case 'harness':
-            return join(ftownDir, 'bin', 'ftown-harness');
-    }
-}
-/** Multi-line usage text listing every routed subcommand. */
+import { runSessions } from './sessions-commands.js';
+import { runHarness } from './harness-commands.js';
+import { runEnv } from './env-commands.js';
+import { runSetup } from './setup.js';
+import { executeCli, isCliEntry } from './cli-entry.js';
+export { isCliEntry } from './cli-entry.js';
 export function usage() {
-    return `Usage: ftown <env|sessions|workflows|harness> [args...]
+    return `Usage: ftown <setup|sessions|harness|env> [args...]
 
 Subcommands:
-  env        Manage per-provider machine tokens (~/.ftown/env.json)
+  setup      Install or upgrade local CLI, hooks, plugins and skill (--repair to recheck)
   sessions   List, create, read and drive ftown agent sessions
-  workflows  Run deterministic, resumable multi-session workflows
-  harness    Inspect and drive the local ftown-bridge harness`;
+  harness    Inspect and drive the local ftown-bridge harness
+  env        Manage per-provider machine tokens (~/.ftown/env.json)`;
 }
-function main() {
-    const argv = process.argv.slice(2);
-    const sub = argv[0];
-    const rest = argv.slice(1);
-    if (sub === undefined || sub === '--help' || sub === '-h' || sub === 'help') {
+export async function runFtown(argv) {
+    const [group, ...args] = argv;
+    if (!group || ['--help', '-h', 'help'].includes(group)) {
         console.log(usage());
-        process.exit(0);
-    }
-    let target;
-    try {
-        target = resolveSubcommandTarget(sub, FTOWN_DIR);
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`ftown: ${msg}`);
-        console.error(usage());
-        process.exit(1);
-    }
-    try {
-        execFileSync(target, rest, { stdio: 'inherit' });
+        return 0;
     }
-    catch (err) {
-        const e = err;
-        if (typeof e.status === 'number')
-            process.exit(e.status);
-        if (e.code === 'ENOENT') {
-            console.error(`ftown ${sub}: not installed (restart the bridge)`);
-            process.exit(1);
-        }
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`ftown ${sub}: ${msg}`);
-        process.exit(1);
+    switch (group) {
+        case 'sessions': return runSessions(args);
+        case 'harness': return runHarness(args);
+        case 'env': return runEnv(args);
+        case 'setup': return runSetup(args);
+        default:
+            console.error(`ftown: Unknown subcommand "${group}"`);
+            console.error(usage());
+            return 1;
     }
 }
-// Only run as a script (installed CLI / `node dist/ftown-cli.js`), never on
-// import — tests import the exported helpers without triggering the dispatcher.
-const entry = process.argv[1];
-if (entry && import.meta.url === pathToFileURL(entry).href) {
-    main();
+if (isCliEntry(import.meta.url, process.argv[1])) {
+    void executeCli(() => runFtown(process.argv.slice(2)));
 }
 //# sourceMappingURL=ftown-cli.js.map

package/dist/ftown-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"ftown-cli.js","sourceRoot":"","sources":["../src/ftown-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ftown-cli.js","sourceRoot":"","sources":["../src/ftown-cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,UAAU,KAAK;IACnB,OAAO;;;;;;oEAM2D,CAAC;AACrE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAc;IAC3C,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9B,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC;IAC3F,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,UAAU,CAAC,CAAC,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1C,KAAK,SAAS,CAAC,CAAC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;QACxC,KAAK,KAAK,CAAC,CAAC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,KAAK,OAAO,CAAC,CAAC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC;YAAS,OAAO,CAAC,KAAK,CAAC,8BAA8B,KAAK,GAAG,CAAC,CAAC;YAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAAC,OAAO,CAAC,CAAC;IACnG,CAAC;AACH,CAAC;AAED,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC"}

package/dist/ftown-env-cli.d.ts

@@ -1,32 +1,3 @@
 #!/usr/bin/env node
-/** Mask all but the last 4 chars; tokens of length <=4 are fully masked. */
-export declare function maskToken(value: string): string;
-/** Resolve a provider flavor to its source env-var KEY. Throws on unknown. */
-export declare function resolveProviderSource(provider: string): string;
-/**
- * Resolve the token for `set` without exposing it on argv.
- *
- * When `positional` is a real value (defined and not the "-" stdin sentinel) it
- * is used verbatim (trimmed) and `onArgvToken` is invoked so the caller can warn
- * that an argv token leaks into `ps`/shell history. Otherwise the token is read
- * from stdin via `readStdin` (piped, keeping it out of `ps` output and shell
- * history). Throws a clear error when no non-empty token is found.
- */
-export declare function resolveSetToken(positional: string | undefined, readStdin: () => Promise<string>, onArgvToken?: () => void): Promise<string>;
-export type DoctorStatus = 'env.json' | 'process-env' | 'missing';
-export interface DoctorFlavorEntry {
-    flavor: string;
-    source: string;
-    status: DoctorStatus;
-}
-export interface DoctorReport {
-    flavors: DoctorFlavorEntry[];
-    blocked: string[];
-}
-/**
- * Classify each flavor's token: stored in env.json wins over the process env;
- * a flavor absent from BOTH is "missing" and listed under `blocked`.
- */
-export declare function buildDoctorReport(store: Record<string, string>, processEnv: Record<string, string | undefined>): DoctorReport;
-/** Dispatch a single command. Throws on bad input; main() maps that to exit 1. */
-export declare function run(argv: string[]): Promise<void>;
+export { isCliEntry } from './cli-entry.js';
+export * from './env-commands.js';

package/dist/ftown-env-cli.js

@@ -1,179 +1,10 @@
 #!/usr/bin/env node
-/**
- * `ftown env` — manage per-provider machine tokens in ~/.ftown/env.json.
- *
- * Installed to ~/.ftown/ftown-env by ftown-bridge (alongside a sibling copy of
- * provider-env-store.js). Imports ONLY ./provider-env-store.js (plus node
- * builtins) so a single sibling copy makes the installed CLI self-sufficient.
- * Every token value is masked before it touches stdout — raw secrets never print.
- */
-import { pathToFileURL } from 'node:url';
-import { PROVIDER_AUTH_ENV, PROVIDER_FLAVORS, listProviderEnv, removeProviderToken, setProviderToken, } from './provider-env-store.js';
-/** Mask all but the last 4 chars; tokens of length <=4 are fully masked. */
-export function maskToken(value) {
-    if (value.length <= 4)
-        return '****';
-    return `****${value.slice(-4)}`;
-}
-/** Resolve a provider flavor to its source env-var KEY. Throws on unknown. */
-export function resolveProviderSource(provider) {
-    const mapping = PROVIDER_AUTH_ENV[provider];
-    if (!mapping) {
-        throw new Error(`Unknown provider "${provider}" — use one of: ${PROVIDER_FLAVORS.join(', ')}`);
-    }
-    return mapping.source;
-}
-/**
- * Resolve the token for `set` without exposing it on argv.
- *
- * When `positional` is a real value (defined and not the "-" stdin sentinel) it
- * is used verbatim (trimmed) and `onArgvToken` is invoked so the caller can warn
- * that an argv token leaks into `ps`/shell history. Otherwise the token is read
- * from stdin via `readStdin` (piped, keeping it out of `ps` output and shell
- * history). Throws a clear error when no non-empty token is found.
- */
-export async function resolveSetToken(positional, readStdin, onArgvToken) {
-    const fromArgv = positional !== undefined && positional !== '-';
-    if (fromArgv)
-        onArgvToken?.();
-    const raw = fromArgv ? positional : await readStdin();
-    const token = (raw ?? '').trim();
-    if (!token) {
-        throw new Error('No token provided — pass it as an argument or pipe it via stdin ' +
-            '(e.g. `printf %s "$TOKEN" | ftown env set <provider> -`)');
-    }
-    return token;
-}
-/** Read all of process.stdin to end, decoded as UTF-8 (trimming is the caller's job). */
-async function readStdin() {
-    const chunks = [];
-    for await (const chunk of process.stdin) {
-        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-    }
-    return Buffer.concat(chunks).toString('utf8');
-}
-/**
- * Classify each flavor's token: stored in env.json wins over the process env;
- * a flavor absent from BOTH is "missing" and listed under `blocked`.
- */
-export function buildDoctorReport(store, processEnv) {
-    const flavors = PROVIDER_FLAVORS.map((flavor) => {
-        const source = PROVIDER_AUTH_ENV[flavor].source;
-        let status;
-        if (store[source])
-            status = 'env.json';
-        else if (processEnv[source])
-            status = 'process-env';
-        else
-            status = 'missing';
-        return { flavor, source, status };
-    });
-    const blocked = flavors.filter((f) => f.status === 'missing').map((f) => f.flavor);
-    return { flavors, blocked };
-}
-/** Positional args, skipping flags and the values of value-taking flags. */
-function positionals(args, valueFlags) {
-    const out = [];
-    for (let i = 0; i < args.length; i++) {
-        const a = args[i];
-        if (a.startsWith('--')) {
-            if (valueFlags.includes(a))
-                i++;
-            continue;
-        }
-        out.push(a);
-    }
-    return out;
-}
-function usage() {
-    console.error(`Usage: ftown env <command> [options]
-
-Commands:
-  set <provider> [token]   Store a machine token for a provider
-  ls                       List configured provider tokens (masked)
-  rm <provider>            Remove a stored provider token
-  doctor                   Report which providers are configured / blocked
-
-Providers: ${PROVIDER_FLAVORS.join(' | ')}
-
-Recommended (keeps the token out of \`ps\` and shell history): omit the token
-positional and read it from stdin —
-  ftown env set zai                        then paste the token and press Ctrl-D
-  printf %s "$TOKEN" | ftown env set zai -  pipe it (the "-" forces stdin)
-
-Tokens live in ~/.ftown/env.json (mode 0o600). Values are always masked on output.`);
-}
-/** Dispatch a single command. Throws on bad input; main() maps that to exit 1. */
-export async function run(argv) {
-    const cmd = argv[0];
-    const rest = argv.slice(1);
-    switch (cmd) {
-        case 'set': {
-            const positional = positionals(rest, []);
-            const provider = positional[0];
-            if (!provider) {
-                throw new Error('Usage: ftown env set <provider> [token]  (omit the token to read it from stdin)');
-            }
-            const source = resolveProviderSource(provider);
-            const token = await resolveSetToken(positional[1], readStdin, () => console.error('ftown-env: warning: the token was passed as an argument, which exposes it to ' +
-                '`ps` and shell history. Prefer stdin: `printf %s "$TOKEN" | ftown env set <provider> -`.'));
-            setProviderToken(source, token);
-            console.log(`set ${source} (${maskToken(token)}) for ${provider}`);
-            break;
-        }
-        case 'ls': {
-            const store = listProviderEnv();
-            const keys = Object.keys(store);
-            if (keys.length === 0) {
-                console.log('(no provider tokens configured)');
-                break;
-            }
-            for (const key of keys)
-                console.log(`${key}  ${maskToken(store[key])}`);
-            break;
-        }
-        case 'rm': {
-            const positional = positionals(rest, []);
-            const provider = positional[0];
-            if (!provider)
-                throw new Error('Usage: ftown env rm <provider>');
-            const source = resolveProviderSource(provider);
-            const existed = removeProviderToken(source);
-            console.log(existed ? `removed ${source} for ${provider}` : `${source} (${provider}) was not set`);
-            break;
-        }
-        case 'doctor': {
-            const report = buildDoctorReport(listProviderEnv(), process.env);
-            for (const f of report.flavors) {
-                console.log(`${f.flavor.padEnd(9)} ${f.source.padEnd(20)} ${f.status}`);
-            }
-            console.log(`blocked: ${report.blocked.length ? report.blocked.join(', ') : '(none)'}`);
-            break;
-        }
-        default:
-            usage();
-            throw new Error(cmd ? `Unknown command "${cmd}"` : 'No command given');
-    }
-}
-async function main() {
-    const argv = process.argv.slice(2);
-    if (argv.length === 0 || argv[0] === '--help' || argv[0] === '-h') {
-        usage();
-        process.exit(argv.length === 0 ? 1 : 0);
-    }
-    try {
-        await run(argv);
-    }
-    catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.error(`ftown-env: ${msg}`);
-        process.exit(1);
-    }
-}
-// Only run as a script (installed CLI / `node dist/ftown-env-cli.js`), never on
-// import — tests import the exported helpers without triggering the dispatcher.
-const entry = process.argv[1];
-if (entry && import.meta.url === pathToFileURL(entry).href) {
-    void main();
+// Compatibility entrypoint; canonical dispatch and implementation are shared.
+import { runFtown } from './ftown-cli.js';
+import { executeCli, isCliEntry } from './cli-entry.js';
+export { isCliEntry } from './cli-entry.js';
+export * from './env-commands.js';
+if (isCliEntry(import.meta.url, process.argv[1])) {
+    void executeCli(() => runFtown(['env', ...process.argv.slice(2)]));
 }
 //# sourceMappingURL=ftown-env-cli.js.map

package/dist/ftown-env-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"ftown-env-cli.js","sourceRoot":"","sources":["../src/ftown-env-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ftown-env-cli.js","sourceRoot":"","sources":["../src/ftown-env-cli.ts"],"names":[],"mappings":";AACA,8EAA8E;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,KAAK,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrE,CAAC"}

package/dist/ftown-home.d.ts

@@ -1,14 +1,28 @@
-/**
- * Default data dir is ~/.ftown/data (machine-stable, like the rest of ~/.ftown).
- * Older bridges defaulted to ./data relative to the launch cwd — if that legacy
- * dir holds sessions and the new default does not exist yet, migrate it once so
- * an upgraded bridge still resurrects its sessions.
- */
+/** Resolve the default without migrating data or touching global state. */
 export declare function resolveDefaultDataDir(): string;
-export declare function resolveFtownHome(dataDir: string, defaultDataDir?: string): string;
+/** Explicit setup-only migration of the historical cwd-relative data directory. */
+export declare function migrateLegacyDataDir(): void;
 /**
- * Test-only: clear the memoized default data dir so a $HOME override in a later
- * test is honored instead of a value cached from an earlier one. Never call this
- * in production — index.ts always passes an explicit `defaultDataDir`.
+ * Resolve the ".ftown home" — the directory that holds THIS bridge instance's
+ * pointer and registry files: bridge.json,
+ * session-registry.json.
+ *
+ * Why this indirection exists:
+ * - The DEFAULT install keeps $HOME/.ftown. The harness CLIs
+ *   (harness-cli.ts / ftown-sessions-cli.ts, and their
+ *   deployed sibling copies) hardcode `join(homedir(), '.ftown', 'bridge.json')`
+ *   to find the primary bridge, so the default MUST stay byte-for-byte at
+ *   $HOME/.ftown or those CLIs break.
+ * - A NON-default `--data-dir` (a Solo test, Docker, or a second co-resident
+ *   bridge) owns its OWN instance files under that dir. It must never write or
+ *   delete the primary bridge's pointer/registry state under $HOME/.ftown — a
+ *   co-resident primary bridge relies on those files.
+ *
+ * Semantics: if `dataDir` resolves to the default data dir, return
+ * `$HOME/.ftown`; otherwise the custom data dir is its own instance home.
+ *
+ * `defaultDataDir` can pass the already-resolved default. Resolution is read-only.
  */
+export declare function resolveFtownHome(dataDir: string, defaultDataDir?: string): string;
+/** Compatibility helper for tests; default resolution no longer caches HOME. */
 export declare function resetFtownHomeForTests(): void;