pi-landstrip 0.17.18 → 0.17.20

package/agents.ts

@@ -2,13 +2,13 @@
 // Copyright (C) Jarkko Sakkinen 2026
 
 import { existsSync, readFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 import { minimatch } from 'minimatch';
 import { getAgentDir } from '@earendil-works/pi-coding-agent';
 
 import { loadLandstripConfig, type ConfigObject } from './config.ts';
+import { expandHomePath, formatError, isRecord } from './util.ts';
 
 export type PermissionAction = 'allow' | 'ask' | 'deny';
 
@@ -58,30 +58,19 @@ const AGENT_FIELDS = new Set([
   'color',
 ]);
 
-function isObject(value: unknown): value is ConfigObject {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 function normalizeAbsolutePath(value: string): string {
   return /^(?:[A-Za-z]:[\\/]|\\\\)/.test(value) ? value.replaceAll('\\', '/') : value;
 }
 
 function expandPattern(pattern: string): string {
-  if (pattern === '~' || pattern === '$HOME') return normalizeAbsolutePath(homedir());
-  if (pattern.startsWith('~/')) {
-    return normalizeAbsolutePath(join(homedir(), pattern.slice(2)));
-  }
-  if (pattern.startsWith('$HOME/')) {
-    return normalizeAbsolutePath(join(homedir(), pattern.slice(6)));
-  }
-  return normalizeAbsolutePath(pattern);
+  return normalizeAbsolutePath(expandHomePath(pattern));
 }
 
 function permissionEntries(permission: string, value: unknown): PermissionRule[] {
   if (value === 'allow' || value === 'ask' || value === 'deny') {
     return [{ permission, pattern: '*', action: value }];
   }
-  if (!isObject(value)) {
+  if (!isRecord(value)) {
     throw new Error(`permission ${permission} must be allow, ask, deny, or a map`);
   }
   return Object.entries(value).map(([pattern, action]) => {
@@ -97,7 +86,7 @@ function normalizePermissions(value: unknown): PermissionRules {
     return [{ permission: '*', pattern: '*', action: value }];
   }
   if (value === undefined) return [];
-  if (!isObject(value)) throw new Error('permission must be allow, ask, deny, or a map');
+  if (!isRecord(value)) throw new Error('permission must be allow, ask, deny, or a map');
   return Object.entries(value).flatMap(([permission, rules]) =>
     permissionEntries(permission, rules),
   );
@@ -108,7 +97,7 @@ function legacyConfigWarnings(piAgentDir: string): string[] {
   if (!existsSync(path)) return [];
   try {
     const value: unknown = JSON.parse(readFileSync(path, 'utf8'));
-    if (!isObject(value)) return [];
+    if (!isRecord(value)) return [];
     const fields = ['agent', 'permission', 'subagents', 'maxSubagents'].filter(
       (field) => value[field] !== undefined,
     );
@@ -135,7 +124,7 @@ function normalizeAgent(name: string, raw: ConfigObject): AgentDefinition | unde
   for (const key of Object.keys(raw)) {
     if (!AGENT_FIELDS.has(key)) throw new Error(`agent ${name} has an unknown field ${key}`);
   }
-  if (raw.options !== undefined && !isObject(raw.options)) {
+  if (raw.options !== undefined && !isRecord(raw.options)) {
     throw new Error(`agent ${name} options must be an object`);
   }
   for (const field of ['temperature', 'top_p'] as const) {
@@ -152,7 +141,7 @@ function normalizeAgent(name: string, raw: ConfigObject): AgentDefinition | unde
   ) {
     throw new Error(`agent ${name} has an invalid mode`);
   }
-  const providerOptions: Record<string, unknown> = isObject(raw.options) ? { ...raw.options } : {};
+  const providerOptions: Record<string, unknown> = isRecord(raw.options) ? { ...raw.options } : {};
   if (typeof raw.temperature === 'number') providerOptions.temperature = raw.temperature;
   if (typeof raw.top_p === 'number') providerOptions.top_p = raw.top_p;
   if (raw.steps !== undefined && (!Number.isInteger(raw.steps) || (raw.steps as number) <= 0)) {
@@ -189,16 +178,16 @@ export function loadAgentCatalog(
     maxSubagents = config.maxSubagents;
     subagents = config.subagents;
   } catch (error) {
-    diagnostics.push(error instanceof Error ? error.message : String(error));
+    diagnostics.push(formatError(error));
   }
 
   const normalized = new Map<string, AgentDefinition>();
-  if (subagents.agent !== undefined && !isObject(subagents.agent)) {
+  if (subagents.agent !== undefined && !isRecord(subagents.agent)) {
     diagnostics.push('subagents.agent must be an object');
-  } else if (isObject(subagents.agent)) {
+  } else if (isRecord(subagents.agent)) {
     for (const name of Object.keys(subagents.agent).sort()) {
       const value = subagents.agent[name];
-      if (!isObject(value)) {
+      if (!isRecord(value)) {
         diagnostics.push(`agent ${name} must be an object`);
         continue;
       }
@@ -206,7 +195,7 @@ export function loadAgentCatalog(
         const agent = normalizeAgent(name, value);
         if (agent) normalized.set(name, agent);
       } catch (error) {
-        diagnostics.push(error instanceof Error ? error.message : String(error));
+        diagnostics.push(formatError(error));
       }
     }
   }
@@ -220,7 +209,7 @@ export function loadAgentCatalog(
   try {
     permissions = normalizePermissions(subagents.permission);
   } catch (error) {
-    diagnostics.push(error instanceof Error ? error.message : String(error));
+    diagnostics.push(formatError(error));
   }
   return { agents: normalized, permissions, diagnostics, warnings, maxSubagents };
 }

package/box.ts

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) Jarkko Sakkinen 2026
+
+import type { Theme } from '@earendil-works/pi-coding-agent';
+import { truncateToWidth, visibleWidth } from '@earendil-works/pi-tui';
+
+export function boxTop(theme: Theme, width: number, title: string): string {
+  if (width < 5) return truncateToWidth(theme.fg('accent', title), Math.max(1, width));
+  const label = theme.fg('accent', ` ${title} `);
+  const fill = theme.fg('border', '─'.repeat(Math.max(0, width - 4 - visibleWidth(label))));
+  return `${theme.fg('border', '╭─')}${label}${fill}${theme.fg('border', '─╮')}`;
+}
+
+export function boxRow(theme: Theme, width: number, content = ''): string {
+  if (width < 5) return truncateToWidth(content, Math.max(1, width));
+  const innerWidth = Math.max(1, width - 4);
+  const border = theme.fg('border', '│');
+  const line = truncateToWidth(content, innerWidth);
+  return `${border} ${line}${' '.repeat(Math.max(0, innerWidth - visibleWidth(line)))} ${border}`;
+}
+
+export function boxBottom(theme: Theme, width: number): string {
+  if (width < 5) return '';
+  const border = (value: string) => theme.fg('border', value);
+  return `${border('╰')}${border('─'.repeat(Math.max(0, width - 2)))}${border('╯')}`;
+}

package/config.ts

@@ -7,6 +7,8 @@ import { fileURLToPath } from 'node:url';
 
 import { getAgentDir, withFileMutationQueue } from '@earendil-works/pi-coding-agent';
 
+import { formatError, isRecord } from './util.ts';
+
 export type ConfigObject = Record<string, unknown>;
 
 export const MAX_SUBAGENTS = 16;
@@ -23,20 +25,16 @@ export interface LandstripConfig extends LandstripConfigFile {
 
 const packageDir = dirname(fileURLToPath(import.meta.url));
 
-function isObject(value: unknown): value is ConfigObject {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-}
-
 function readConfig(path: string): LandstripConfigFile {
   if (!existsSync(path)) return {};
   let value: unknown;
   try {
     value = JSON.parse(readFileSync(path, 'utf8'));
   } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
+    const message = formatError(error);
     throw new Error(`${path}: ${message}`);
   }
-  if (!isObject(value)) throw new Error(`${path} must contain a JSON object`);
+  if (!isRecord(value)) throw new Error(`${path} must contain a JSON object`);
   for (const key of Object.keys(value)) {
     if (key !== 'maxSubagents' && key !== 'subagents') {
       throw new Error(`${path}: unknown top-level field ${key}`);
@@ -48,7 +46,7 @@ function readConfig(path: string): LandstripConfigFile {
 function mergeValue(base: unknown, override: unknown): unknown {
   if (override === undefined) return base;
   if (Array.isArray(override)) return [...override];
-  if (isObject(base) && isObject(override)) {
+  if (isRecord(base) && isRecord(override)) {
     const result: ConfigObject = { ...base };
     for (const [key, value] of Object.entries(override)) {
       const merged = mergeValue(result[key], value);
@@ -60,13 +58,14 @@ function mergeValue(base: unknown, override: unknown): unknown {
   return override;
 }
 
-function getLandstripConfigPaths(
+export function getPiConfigPaths(
   cwd: string,
+  fileName: string,
   agentDir = getAgentDir(),
 ): { globalPath: string; projectPath: string } {
   return {
-    globalPath: join(agentDir, 'subagents.json'),
-    projectPath: join(cwd, '.pi', 'subagents.json'),
+    globalPath: join(agentDir, fileName),
+    projectPath: join(cwd, '.pi', fileName),
   };
 }
 
@@ -76,7 +75,7 @@ export async function setMaxSubagentsConfig(
   includeProject = true,
   agentDir = getAgentDir(),
 ): Promise<'global' | 'project'> {
-  const { projectPath } = getLandstripConfigPaths(cwd, agentDir);
+  const { projectPath } = getPiConfigPaths(cwd, 'subagents.json', agentDir);
   const scope = includeProject && existsSync(projectPath) ? 'project' : 'global';
   await setMaxSubagentsConfigForScope(cwd, maxSubagents, scope, agentDir);
   return scope;
@@ -91,7 +90,7 @@ export async function setMaxSubagentsConfigForScope(
   if (!Number.isInteger(maxSubagents) || maxSubagents < 0 || maxSubagents > MAX_SUBAGENTS) {
     throw new Error(`maxSubagents must be an integer from 0 to ${MAX_SUBAGENTS}`);
   }
-  const { globalPath, projectPath } = getLandstripConfigPaths(cwd, agentDir);
+  const { globalPath, projectPath } = getPiConfigPaths(cwd, 'subagents.json', agentDir);
   const path = scope === 'project' ? projectPath : globalPath;
   await withFileMutationQueue(path, async () => {
     const config = readConfig(path);
@@ -106,7 +105,7 @@ export function loadLandstripConfig(
   includeProject = true,
   agentDir = getAgentDir(),
 ): LandstripConfig {
-  const { globalPath, projectPath } = getLandstripConfigPaths(cwd, agentDir);
+  const { globalPath, projectPath } = getPiConfigPaths(cwd, 'subagents.json', agentDir);
   let config = readConfig(join(packageDir, 'subagents.json'));
   config = mergeValue(config, readConfig(globalPath)) as LandstripConfigFile;
   if (includeProject) {
@@ -119,6 +118,6 @@ export function loadLandstripConfig(
   ) {
     throw new Error(`maxSubagents must be an integer from 0 to ${MAX_SUBAGENTS}`);
   }
-  if (!isObject(config.subagents)) throw new Error('subagents must be an object');
+  if (!isRecord(config.subagents)) throw new Error('subagents must be an object');
   return config as LandstripConfig;
 }