@fnclaude/cli 0.7.8 → 1.0.1

package/src/repoSettings.ts

@@ -11,6 +11,7 @@
 import { readFileSync } from 'node:fs';
 import { homedir, platform } from 'node:os';
 import { join } from 'node:path';
+import { errorMessage } from './errors.js';
 
 /**
  * fnclaude's view of the shared `repoSettings` block. Only the keys
@@ -80,7 +81,7 @@ export function mergeRepoSettings(paths: string[]): LoadRepoSettingsResult {
   const warnings: string[] = [];
   for (const p of paths) {
     const { settings: f, warning } = readRepoSettings(p);
-    if (warning !== null) warnings.push(warning);
+    if (warning !== undefined) warnings.push(warning);
     if (!f) continue;
     // Shallow-merge per field: only overwrite when the higher tier sets
     // a non-empty value.
@@ -93,8 +94,8 @@ export function mergeRepoSettings(paths: string[]): LoadRepoSettingsResult {
 }
 
 interface ReadRepoSettingsResult {
-  settings: RepoSettings | null;
-  warning: string | null;
+  settings: RepoSettings | undefined;
+  warning: string | undefined;
 }
 
 function readRepoSettings(path: string): ReadRepoSettingsResult {
@@ -103,25 +104,25 @@ function readRepoSettings(path: string): ReadRepoSettingsResult {
     data = readFileSync(path, 'utf8');
   } catch {
     // Missing file is the common path — stay silent.
-    return { settings: null, warning: null };
+    return { settings: undefined, warning: undefined };
   }
   let f: SettingsFile;
   try {
     f = JSON.parse(data) as SettingsFile;
   } catch (err) {
     return {
-      settings: null,
-      warning: `fnclaude: repo-settings file ${path} is malformed, skipping: ${(err as Error).message}`,
+      settings: undefined,
+      warning: `fnclaude: repo-settings file ${path} is malformed, skipping: ${errorMessage(err)}`,
     };
   }
-  return { settings: f.repoSettings ?? null, warning: null };
+  return { settings: f.repoSettings ?? undefined, warning: undefined };
 }
 
 /**
  * Platform-specific path to Claude Code's managed-settings.json, or
- * `null` on platforms with no such convention.
+ * `undefined` on platforms with no such convention.
  */
-export function managedSettingsPath(): string | null {
+export function managedSettingsPath(): string | undefined {
   switch (platform()) {
     case 'linux':
       return '/etc/claude-code/managed-settings.json';
@@ -130,10 +131,10 @@ export function managedSettingsPath(): string | null {
     case 'win32': {
       const pd = process.env.ProgramData;
       if (pd) return join(pd, 'ClaudeCode', 'managed-settings.json');
-      return null;
+      return undefined;
     }
     default:
-      return null;
+      return undefined;
   }
 }
 

package/src/sanitize.ts

@@ -7,7 +7,7 @@
 // '/' is allowed so git-style nested refs (feat/foo, team/x/y/z) pass
 // through and produce nested worktree paths.
 //
-// Returns null when:
+// Returns undefined when:
 //   - the input is empty
 //   - the input starts with '/' (would escape the configured path prefix)
 //   - the result reduces to empty after sanitization
@@ -21,9 +21,9 @@ const RE_PATH_SAFE_BAD = /[^A-Za-z0-9._/-]+/g;
 const RE_DASH_RUN = /-{2,}/g;
 const RE_SLASH_RUN = /\/{2,}/g;
 
-export function sanitizeName(s: string): string | null {
-  if (s === '') return null;
-  if (s.startsWith('/')) return null;
+export function sanitizeName(s: string): string | undefined {
+  if (s === '') return undefined;
+  if (s.startsWith('/')) return undefined;
 
   let out = s.replace(RE_PATH_SAFE_BAD, '-');
   out = out.replace(RE_DASH_RUN, '-');
@@ -31,8 +31,8 @@ export function sanitizeName(s: string): string | null {
   out = trimLeftAny(out, '-.');
   out = trimRightAny(out, '-/');
 
-  if (out === '') return null;
-  if (out.includes('..')) return null;
+  if (out === '') return undefined;
+  if (out.includes('..')) return undefined;
   return out;
 }
 
@@ -71,7 +71,7 @@ export function sanitizeNamesInPassthrough(p: readonly string[]): SanitizeNamesR
     if ((t === '--name' || t === '-n') && i + 1 < out.length) {
       const val = out[i + 1]!;
       const decision = decideSanitize(val);
-      if (decision.warning !== null) warnings.push(decision.warning);
+      if (decision.warning !== undefined) warnings.push(decision.warning);
       if (decision.replace) out[i + 1] = decision.cleaned;
       i++; // skip the value slot
       continue;
@@ -79,14 +79,14 @@ export function sanitizeNamesInPassthrough(p: readonly string[]): SanitizeNamesR
     if (t.startsWith('--name=')) {
       const val = t.slice('--name='.length);
       const decision = decideSanitize(val);
-      if (decision.warning !== null) warnings.push(decision.warning);
+      if (decision.warning !== undefined) warnings.push(decision.warning);
       if (decision.replace) out[i] = `--name=${decision.cleaned}`;
       continue;
     }
     if (t.startsWith('-n=')) {
       const val = t.slice('-n='.length);
       const decision = decideSanitize(val);
-      if (decision.warning !== null) warnings.push(decision.warning);
+      if (decision.warning !== undefined) warnings.push(decision.warning);
       if (decision.replace) out[i] = `-n=${decision.cleaned}`;
       continue;
     }
@@ -96,13 +96,13 @@ export function sanitizeNamesInPassthrough(p: readonly string[]): SanitizeNamesR
 
 interface SanitizeDecision {
   cleaned: string;
-  warning: string | null;
+  warning: string | undefined;
   replace: boolean;
 }
 
 function decideSanitize(val: string): SanitizeDecision {
   const cleaned = sanitizeName(val);
-  if (cleaned === null) {
+  if (cleaned === undefined) {
     return {
       cleaned: val,
       warning: `fnclaude: --name ${JSON.stringify(val)} has no path-safe characters; passing through unchanged`,
@@ -110,7 +110,7 @@ function decideSanitize(val: string): SanitizeDecision {
     };
   }
   if (cleaned === val) {
-    return { cleaned: '', warning: null, replace: false };
+    return { cleaned: '', warning: undefined, replace: false };
   }
   return {
     cleaned,

package/src/sessionState.ts

@@ -87,7 +87,7 @@ export function readLivePermissionMode(
     } catch {
       continue; // malformed line — ignore
     }
-    if (r.type === 'permission-mode' && typeof r.permissionMode === 'string' && r.permissionMode !== '') {
+    if (r.type === 'permission-mode' && typeof r.permissionMode === 'string' && r.permissionMode) {
       latest = r.permissionMode;
     }
   }
@@ -110,10 +110,10 @@ export interface RestartReminderOverrides {
 
 /**
  * Read the trailing entries of `data` and return the most recent `uuid`
- * field, or `null` if none found. Used to link the appended reminder into
- * the JSONL parent-chain.
+ * field, or `undefined` if none found. Used to link the appended reminder
+ * into the JSONL parent-chain.
  */
-function lastEntryUUID(data: string): string | null {
+function lastEntryUUID(data: string): string | undefined {
   const lines = data.split('\n');
   for (let i = lines.length - 1; i >= 0; i--) {
     const line = lines[i];
@@ -128,7 +128,7 @@ function lastEntryUUID(data: string): string | null {
       return parsed.uuid;
     }
   }
-  return null;
+  return undefined;
 }
 
 /** Render the system-reminder body text, optionally naming overrides. */
@@ -136,16 +136,16 @@ export function renderRestartReminderContent(
   overrides?: RestartReminderOverrides,
 ): string {
   const parts: string[] = [];
-  if (overrides?.model && overrides.model !== '') {
+  if (overrides?.model) {
     parts.push(`model swap to ${overrides.model}`);
   }
-  if (overrides?.effort && overrides.effort !== '') {
+  if (overrides?.effort) {
     parts.push(`effort=${overrides.effort}`);
   }
-  if (overrides?.permissionMode && overrides.permissionMode !== '') {
+  if (overrides?.permissionMode) {
     parts.push(`permission-mode=${overrides.permissionMode}`);
   }
-  if (overrides?.agent && overrides.agent !== '') {
+  if (overrides?.agent) {
     parts.push(`agent=${overrides.agent}`);
   }
   if (overrides?.ide) {
@@ -192,7 +192,9 @@ export function appendRestartReminder(
     // fresh anyway, so the reminder would be off-target.
     return;
   }
-  const parentUuid = lastEntryUUID(existing);
+  // JSONL parentUuid is on the wire — keep null encoding for "no parent"
+  // entries to match Claude Code's own writer.
+  const parentUuid = lastEntryUUID(existing) ?? null;
   const entry = {
     parentUuid,
     isSidechain: false,

package/src/worktree.ts

@@ -114,15 +114,15 @@ export function listWorktrees(dir: string, runner: GitRunner = defaultGitRunner)
  *   3. Basename of the path    == query  (last-resort fallback for worktrees
  *      whose branch was renamed or whose creator skipped the convention)
  *
- * Returns null when no entry matches. Undefined `query` short-circuits to
- * null so that detached worktrees (branch=undefined) can't be matched by
- * accident.
+ * Returns undefined when no entry matches. Undefined `query` short-circuits
+ * to undefined so that detached worktrees (branch=undefined) can't be
+ * matched by accident.
  */
 export function findWorktree(
   worktrees: readonly WorktreeInfo[],
   query: string | undefined,
-): WorktreeInfo | null {
-  if (query === undefined) return null;
+): WorktreeInfo | undefined {
+  if (query === undefined) return undefined;
 
   for (const wt of worktrees) {
     if (wt.branch === query) return wt;
@@ -133,7 +133,7 @@ export function findWorktree(
   for (const wt of worktrees) {
     if (basename(wt.path) === query) return wt;
   }
-  return null;
+  return undefined;
 }
 
 function stripWorktreePrefix(branch: string): string {