ce1ad35706
- Add version-match early return to initResources() — skips ~800ms of synchronous rmSync + cpSync when managed-resources.json already matches the running GSD version (steady-state on every launch) - Consolidate package.json reads in loader.ts from 3 to 1 — single read reused for --version, --help, banner, and GSD_VERSION env var - Replace blocking checkAndPromptForUpdates() with passive checkForUpdates() to avoid blocking startup on npm registry fetch + user prompt (up to 5s) - Cache bundled extension keys in resource-loader to avoid redundant filesystem scan in buildResourceLoader() - Use GSD_VERSION env var in getBundledGsdVersion() to skip package.json re-read from resource-loader.ts - Add test verifying version-skip behavior: marker file survives when versions match, gets cleaned on mismatch
506 lines
19 KiB
TypeScript
506 lines
19 KiB
TypeScript
import {
|
|
AuthStorage,
|
|
DefaultResourceLoader,
|
|
ModelRegistry,
|
|
SettingsManager,
|
|
SessionManager,
|
|
createAgentSession,
|
|
InteractiveMode,
|
|
runPrintMode,
|
|
runRpcMode,
|
|
} from '@gsd/pi-coding-agent'
|
|
import { existsSync, readdirSync, renameSync, readFileSync } from 'node:fs'
|
|
import { join } from 'node:path'
|
|
import { agentDir, sessionsDir, authFilePath } from './app-paths.js'
|
|
import { initResources, buildResourceLoader, getNewerManagedResourceVersion } from './resource-loader.js'
|
|
import { ensureManagedTools } from './tool-bootstrap.js'
|
|
import { loadStoredEnvKeys } from './wizard.js'
|
|
import { getPiDefaultModelAndProvider, migratePiCredentials } from './pi-migration.js'
|
|
import { shouldRunOnboarding, runOnboarding } from './onboarding.js'
|
|
import chalk from 'chalk'
|
|
import { checkForUpdates } from './update-check.js'
|
|
import { printHelp, printSubcommandHelp } from './help-text.js'
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Minimal CLI arg parser — detects print/subagent mode flags
|
|
// ---------------------------------------------------------------------------
|
|
interface CliFlags {
|
|
mode?: 'text' | 'json' | 'rpc' | 'mcp'
|
|
print?: boolean
|
|
continue?: boolean
|
|
noSession?: boolean
|
|
model?: string
|
|
listModels?: string | true
|
|
extensions: string[]
|
|
appendSystemPrompt?: string
|
|
tools?: string[]
|
|
messages: string[]
|
|
/** Set by `gsd sessions` when the user picks a specific session to resume */
|
|
_selectedSessionPath?: string
|
|
}
|
|
|
|
function exitIfManagedResourcesAreNewer(currentAgentDir: string): void {
|
|
const currentVersion = process.env.GSD_VERSION || '0.0.0'
|
|
const managedVersion = getNewerManagedResourceVersion(currentAgentDir, currentVersion)
|
|
if (!managedVersion) {
|
|
return
|
|
}
|
|
|
|
process.stderr.write(
|
|
`[gsd] ${chalk.yellow('Version mismatch detected')}\n` +
|
|
`[gsd] Synced resources are from ${chalk.bold(`v${managedVersion}`)}, but this \`gsd\` binary is ${chalk.dim(`v${currentVersion}`)}.\n` +
|
|
`[gsd] Run ${chalk.bold('npm install -g gsd-pi@latest')} or ${chalk.bold('gsd update')}, then try again.\n`,
|
|
)
|
|
process.exit(1)
|
|
}
|
|
|
|
function parseCliArgs(argv: string[]): CliFlags {
|
|
const flags: CliFlags = { extensions: [], messages: [] }
|
|
const args = argv.slice(2) // skip node + script
|
|
for (let i = 0; i < args.length; i++) {
|
|
const arg = args[i]
|
|
if (arg === '--mode' && i + 1 < args.length) {
|
|
const m = args[++i]
|
|
if (m === 'text' || m === 'json' || m === 'rpc' || m === 'mcp') flags.mode = m
|
|
} else if (arg === '--print' || arg === '-p') {
|
|
flags.print = true
|
|
} else if (arg === '--continue' || arg === '-c') {
|
|
flags.continue = true
|
|
} else if (arg === '--no-session') {
|
|
flags.noSession = true
|
|
} else if (arg === '--model' && i + 1 < args.length) {
|
|
flags.model = args[++i]
|
|
} else if (arg === '--extension' && i + 1 < args.length) {
|
|
flags.extensions.push(args[++i])
|
|
} else if (arg === '--append-system-prompt' && i + 1 < args.length) {
|
|
flags.appendSystemPrompt = args[++i]
|
|
} else if (arg === '--tools' && i + 1 < args.length) {
|
|
flags.tools = args[++i].split(',')
|
|
} else if (arg === '--list-models') {
|
|
flags.listModels = (i + 1 < args.length && !args[i + 1].startsWith('-')) ? args[++i] : true
|
|
} else if (arg === '--version' || arg === '-v') {
|
|
process.stdout.write((process.env.GSD_VERSION || '0.0.0') + '\n')
|
|
process.exit(0)
|
|
} else if (arg === '--help' || arg === '-h') {
|
|
printHelp(process.env.GSD_VERSION || '0.0.0')
|
|
process.exit(0)
|
|
} else if (!arg.startsWith('--') && !arg.startsWith('-')) {
|
|
flags.messages.push(arg)
|
|
}
|
|
}
|
|
return flags
|
|
}
|
|
|
|
const cliFlags = parseCliArgs(process.argv)
|
|
const isPrintMode = cliFlags.print || cliFlags.mode !== undefined
|
|
|
|
// `gsd <subcommand> --help` — show subcommand-specific help
|
|
const subcommand = cliFlags.messages[0]
|
|
if (subcommand && process.argv.includes('--help')) {
|
|
if (printSubcommandHelp(subcommand, process.env.GSD_VERSION || '0.0.0')) {
|
|
process.exit(0)
|
|
}
|
|
}
|
|
|
|
// `gsd config` — replay the setup wizard and exit
|
|
if (cliFlags.messages[0] === 'config') {
|
|
const authStorage = AuthStorage.create(authFilePath)
|
|
loadStoredEnvKeys(authStorage)
|
|
await runOnboarding(authStorage)
|
|
process.exit(0)
|
|
}
|
|
|
|
// `gsd update` — update to the latest version via npm
|
|
if (cliFlags.messages[0] === 'update') {
|
|
const { runUpdate } = await import('./update-cmd.js')
|
|
await runUpdate()
|
|
process.exit(0)
|
|
}
|
|
|
|
// `gsd sessions` — list past sessions and pick one to resume
|
|
if (cliFlags.messages[0] === 'sessions') {
|
|
const cwd = process.cwd()
|
|
const safePath = `--${cwd.replace(/^[/\\]/, '').replace(/[/\\:]/g, '-')}--`
|
|
const projectSessionsDir = join(sessionsDir, safePath)
|
|
|
|
process.stderr.write(chalk.dim(`Loading sessions for ${cwd}...\n`))
|
|
const sessions = await SessionManager.list(cwd, projectSessionsDir)
|
|
|
|
if (sessions.length === 0) {
|
|
process.stderr.write(chalk.yellow('No sessions found for this directory.\n'))
|
|
process.exit(0)
|
|
}
|
|
|
|
process.stderr.write(chalk.bold(`\n Sessions (${sessions.length}):\n\n`))
|
|
|
|
const maxShow = 20
|
|
const toShow = sessions.slice(0, maxShow)
|
|
for (let i = 0; i < toShow.length; i++) {
|
|
const s = toShow[i]
|
|
const date = s.modified.toLocaleString()
|
|
const msgs = s.messageCount
|
|
const name = s.name ? ` ${chalk.cyan(s.name)}` : ''
|
|
const preview = s.firstMessage
|
|
? s.firstMessage.replace(/\n/g, ' ').substring(0, 80)
|
|
: chalk.dim('(empty)')
|
|
const num = String(i + 1).padStart(3)
|
|
process.stderr.write(` ${chalk.bold(num)}. ${chalk.green(date)} ${chalk.dim(`(${msgs} msgs)`)}${name}\n`)
|
|
process.stderr.write(` ${chalk.dim(preview)}\n\n`)
|
|
}
|
|
|
|
if (sessions.length > maxShow) {
|
|
process.stderr.write(chalk.dim(` ... and ${sessions.length - maxShow} more\n\n`))
|
|
}
|
|
|
|
// Interactive selection
|
|
const readline = await import('node:readline')
|
|
const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
|
|
const answer = await new Promise<string>((resolve) => {
|
|
rl.question(chalk.bold(' Enter session number to resume (or q to quit): '), resolve)
|
|
})
|
|
rl.close()
|
|
|
|
const choice = parseInt(answer, 10)
|
|
if (isNaN(choice) || choice < 1 || choice > toShow.length) {
|
|
process.stderr.write(chalk.dim('Cancelled.\n'))
|
|
process.exit(0)
|
|
}
|
|
|
|
const selected = toShow[choice - 1]
|
|
process.stderr.write(chalk.green(`\nResuming session from ${selected.modified.toLocaleString()}...\n\n`))
|
|
|
|
// Mark for the interactive session below to open this specific session
|
|
cliFlags.continue = true
|
|
cliFlags._selectedSessionPath = selected.path
|
|
}
|
|
|
|
// `gsd headless` — run auto-mode without TUI
|
|
if (cliFlags.messages[0] === 'headless') {
|
|
const { runHeadless, parseHeadlessArgs } = await import('./headless.js')
|
|
await runHeadless(parseHeadlessArgs(process.argv))
|
|
process.exit(0)
|
|
}
|
|
|
|
// Pi's tool bootstrap can mis-detect already-installed fd/rg on some systems
|
|
// because spawnSync(..., ["--version"]) returns EPERM despite a zero exit code.
|
|
// Provision local managed binaries first so Pi sees them without probing PATH.
|
|
ensureManagedTools(join(agentDir, 'bin'))
|
|
|
|
const authStorage = AuthStorage.create(authFilePath)
|
|
loadStoredEnvKeys(authStorage)
|
|
migratePiCredentials(authStorage)
|
|
|
|
// Resolve models.json path with fallback to ~/.pi/agent/models.json
|
|
const { resolveModelsJsonPath } = await import('./models-resolver.js')
|
|
const modelsJsonPath = resolveModelsJsonPath()
|
|
|
|
const modelRegistry = new ModelRegistry(authStorage, modelsJsonPath)
|
|
const settingsManager = SettingsManager.create(agentDir)
|
|
|
|
// Run onboarding wizard on first launch (no LLM provider configured)
|
|
if (!isPrintMode && shouldRunOnboarding(authStorage, settingsManager.getDefaultProvider())) {
|
|
await runOnboarding(authStorage)
|
|
|
|
// Clean up stdin state left by @clack/prompts.
|
|
// readline.emitKeypressEvents() adds a permanent data listener and
|
|
// readline.createInterface() may leave stdin paused. Remove stale
|
|
// listeners and pause stdin so the TUI can start with a clean slate.
|
|
process.stdin.removeAllListeners('data')
|
|
process.stdin.removeAllListeners('keypress')
|
|
if (process.stdin.setRawMode) process.stdin.setRawMode(false)
|
|
process.stdin.pause()
|
|
}
|
|
|
|
// Update check — non-blocking banner check; interactive prompt deferred to avoid
|
|
// blocking startup. The passive checkForUpdates() prints a banner if an update is
|
|
// available (using cached data or a background fetch) without blocking the TUI.
|
|
if (!isPrintMode) {
|
|
checkForUpdates().catch(() => {})
|
|
}
|
|
|
|
// Warn if terminal is too narrow for readable output
|
|
if (!isPrintMode && process.stdout.columns && process.stdout.columns < 40) {
|
|
process.stderr.write(
|
|
chalk.yellow(`[gsd] Terminal width is ${process.stdout.columns} columns (minimum recommended: 40). Output may be unreadable.\n`),
|
|
)
|
|
}
|
|
|
|
// --list-models: print available models and exit (no TTY needed)
|
|
if (cliFlags.listModels !== undefined) {
|
|
const models = modelRegistry.getAvailable()
|
|
if (models.length === 0) {
|
|
console.log('No models available. Set API keys in environment variables.')
|
|
process.exit(0)
|
|
}
|
|
|
|
const searchPattern = typeof cliFlags.listModels === 'string' ? cliFlags.listModels : undefined
|
|
let filtered = models
|
|
if (searchPattern) {
|
|
const q = searchPattern.toLowerCase()
|
|
filtered = models.filter((m) => `${m.provider} ${m.id} ${m.name}`.toLowerCase().includes(q))
|
|
}
|
|
|
|
// Sort by name descending (newest first), then provider, then id
|
|
filtered.sort((a, b) => {
|
|
const nameCmp = b.name.localeCompare(a.name)
|
|
if (nameCmp !== 0) return nameCmp
|
|
const provCmp = a.provider.localeCompare(b.provider)
|
|
if (provCmp !== 0) return provCmp
|
|
return a.id.localeCompare(b.id)
|
|
})
|
|
|
|
const fmt = (n: number) => n >= 1_000_000 ? `${n / 1_000_000}M` : n >= 1_000 ? `${n / 1_000}K` : `${n}`
|
|
const rows = filtered.map((m) => [
|
|
m.provider,
|
|
m.id,
|
|
m.name,
|
|
fmt(m.contextWindow),
|
|
fmt(m.maxTokens),
|
|
m.reasoning ? 'yes' : 'no',
|
|
])
|
|
const hdrs = ['provider', 'model', 'name', 'context', 'max-out', 'thinking']
|
|
const widths = hdrs.map((h, i) => Math.max(h.length, ...rows.map((r) => r[i].length)))
|
|
const pad = (s: string, w: number) => s.padEnd(w)
|
|
console.log(hdrs.map((h, i) => pad(h, widths[i])).join(' '))
|
|
for (const row of rows) {
|
|
console.log(row.map((c, i) => pad(c, widths[i])).join(' '))
|
|
}
|
|
process.exit(0)
|
|
}
|
|
|
|
// Validate configured model on startup — catches stale settings from prior installs
|
|
// (e.g. grok-2 which no longer exists) and fresh installs with no settings.
|
|
// Only resets the default when the configured model no longer exists in the registry;
|
|
// never overwrites a valid user choice.
|
|
const configuredProvider = settingsManager.getDefaultProvider()
|
|
const configuredModel = settingsManager.getDefaultModel()
|
|
const allModels = modelRegistry.getAll()
|
|
const availableModels = modelRegistry.getAvailable()
|
|
const configuredExists = configuredProvider && configuredModel &&
|
|
allModels.some((m) => m.provider === configuredProvider && m.id === configuredModel)
|
|
const configuredAvailable = configuredProvider && configuredModel &&
|
|
availableModels.some((m) => m.provider === configuredProvider && m.id === configuredModel)
|
|
|
|
if (!configuredModel || !configuredExists) {
|
|
// Model not configured at all, or removed from registry — pick a fallback.
|
|
// Only fires when the model is genuinely unknown (not just temporarily unavailable).
|
|
const piDefault = getPiDefaultModelAndProvider()
|
|
const preferred =
|
|
(piDefault
|
|
? availableModels.find((m) => m.provider === piDefault.provider && m.id === piDefault.model)
|
|
: undefined) ||
|
|
availableModels.find((m) => m.provider === 'openai' && m.id === 'gpt-5.4') ||
|
|
availableModels.find((m) => m.provider === 'openai') ||
|
|
availableModels.find((m) => m.provider === 'anthropic' && m.id === 'claude-opus-4-6') ||
|
|
availableModels.find((m) => m.provider === 'anthropic' && m.id.includes('opus')) ||
|
|
availableModels.find((m) => m.provider === 'anthropic') ||
|
|
availableModels[0]
|
|
if (preferred) {
|
|
settingsManager.setDefaultModelAndProvider(preferred.provider, preferred.id)
|
|
}
|
|
}
|
|
|
|
if (settingsManager.getDefaultThinkingLevel() !== 'off' && !configuredExists) {
|
|
settingsManager.setDefaultThinkingLevel('off')
|
|
}
|
|
|
|
// GSD always uses quiet startup — the gsd extension renders its own branded header
|
|
if (!settingsManager.getQuietStartup()) {
|
|
settingsManager.setQuietStartup(true)
|
|
}
|
|
|
|
// Collapse changelog by default — avoid wall of text on updates
|
|
if (!settingsManager.getCollapseChangelog()) {
|
|
settingsManager.setCollapseChangelog(true)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Print / subagent mode — single-shot execution, no TTY required
|
|
// ---------------------------------------------------------------------------
|
|
if (isPrintMode) {
|
|
const sessionManager = cliFlags.noSession
|
|
? SessionManager.inMemory()
|
|
: SessionManager.create(process.cwd())
|
|
|
|
// Read --append-system-prompt file content (subagent writes agent system prompts to temp files)
|
|
let appendSystemPrompt: string | undefined
|
|
if (cliFlags.appendSystemPrompt) {
|
|
try {
|
|
appendSystemPrompt = readFileSync(cliFlags.appendSystemPrompt, 'utf-8')
|
|
} catch {
|
|
// If it's not a file path, treat it as literal text
|
|
appendSystemPrompt = cliFlags.appendSystemPrompt
|
|
}
|
|
}
|
|
|
|
exitIfManagedResourcesAreNewer(agentDir)
|
|
initResources(agentDir)
|
|
const resourceLoader = new DefaultResourceLoader({
|
|
agentDir,
|
|
additionalExtensionPaths: cliFlags.extensions.length > 0 ? cliFlags.extensions : undefined,
|
|
appendSystemPrompt,
|
|
})
|
|
await resourceLoader.reload()
|
|
|
|
const { session, extensionsResult } = await createAgentSession({
|
|
authStorage,
|
|
modelRegistry,
|
|
settingsManager,
|
|
sessionManager,
|
|
resourceLoader,
|
|
})
|
|
|
|
if (extensionsResult.errors.length > 0) {
|
|
for (const err of extensionsResult.errors) {
|
|
process.stderr.write(`[gsd] Extension load error: ${err.error}\n`)
|
|
}
|
|
}
|
|
|
|
// Apply --model override if specified
|
|
if (cliFlags.model) {
|
|
const available = modelRegistry.getAvailable()
|
|
const match =
|
|
available.find((m) => m.id === cliFlags.model) ||
|
|
available.find((m) => `${m.provider}/${m.id}` === cliFlags.model)
|
|
if (match) {
|
|
session.setModel(match)
|
|
}
|
|
}
|
|
|
|
const mode = cliFlags.mode || 'text'
|
|
|
|
if (mode === 'rpc') {
|
|
await runRpcMode(session)
|
|
process.exit(0)
|
|
}
|
|
|
|
if (mode === 'mcp') {
|
|
const { startMcpServer } = await import('./mcp-server.js')
|
|
await startMcpServer({
|
|
tools: session.agent.state.tools ?? [],
|
|
version: process.env.GSD_VERSION || '0.0.0',
|
|
})
|
|
// MCP server runs until the transport closes; keep alive
|
|
await new Promise(() => {})
|
|
}
|
|
|
|
await runPrintMode(session, {
|
|
mode: mode as 'text' | 'json',
|
|
messages: cliFlags.messages,
|
|
})
|
|
process.exit(0)
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Interactive mode — normal TTY session
|
|
// ---------------------------------------------------------------------------
|
|
|
|
// Per-directory session storage — same encoding as the upstream SDK so that
|
|
// /resume only shows sessions from the current working directory.
|
|
const cwd = process.cwd()
|
|
const safePath = `--${cwd.replace(/^[/\\]/, '').replace(/[/\\:]/g, '-')}--`
|
|
const projectSessionsDir = join(sessionsDir, safePath)
|
|
|
|
// Migrate legacy flat sessions: before per-directory scoping, all .jsonl session
|
|
// files lived directly in ~/.gsd/sessions/. Move them into the correct per-cwd
|
|
// subdirectory so /resume can find them.
|
|
if (existsSync(sessionsDir)) {
|
|
try {
|
|
const entries = readdirSync(sessionsDir)
|
|
const flatJsonl = entries.filter(f => f.endsWith('.jsonl'))
|
|
if (flatJsonl.length > 0) {
|
|
const { mkdirSync } = await import('node:fs')
|
|
mkdirSync(projectSessionsDir, { recursive: true })
|
|
for (const file of flatJsonl) {
|
|
const src = join(sessionsDir, file)
|
|
const dst = join(projectSessionsDir, file)
|
|
if (!existsSync(dst)) {
|
|
renameSync(src, dst)
|
|
}
|
|
}
|
|
}
|
|
} catch {
|
|
// Non-fatal — don't block startup if migration fails
|
|
}
|
|
}
|
|
|
|
const sessionManager = cliFlags._selectedSessionPath
|
|
? SessionManager.open(cliFlags._selectedSessionPath, projectSessionsDir)
|
|
: cliFlags.continue
|
|
? SessionManager.continueRecent(cwd, projectSessionsDir)
|
|
: SessionManager.create(cwd, projectSessionsDir)
|
|
|
|
exitIfManagedResourcesAreNewer(agentDir)
|
|
initResources(agentDir)
|
|
const resourceLoader = buildResourceLoader(agentDir)
|
|
await resourceLoader.reload()
|
|
|
|
const { session, extensionsResult } = await createAgentSession({
|
|
authStorage,
|
|
modelRegistry,
|
|
settingsManager,
|
|
sessionManager,
|
|
resourceLoader,
|
|
})
|
|
|
|
if (extensionsResult.errors.length > 0) {
|
|
for (const err of extensionsResult.errors) {
|
|
process.stderr.write(`[gsd] Extension load error: ${err.error}\n`)
|
|
}
|
|
}
|
|
|
|
// Restore scoped models from settings on startup.
|
|
// The upstream InteractiveMode reads enabledModels from settings when /scoped-models is opened,
|
|
// but doesn't apply them to the session at startup — so Ctrl+P cycles all models instead of
|
|
// just the saved selection until the user re-runs /scoped-models.
|
|
const enabledModelPatterns = settingsManager.getEnabledModels()
|
|
if (enabledModelPatterns && enabledModelPatterns.length > 0) {
|
|
const availableModels = modelRegistry.getAvailable()
|
|
const scopedModels: Array<{ model: (typeof availableModels)[number] }> = []
|
|
const seen = new Set<string>()
|
|
|
|
for (const pattern of enabledModelPatterns) {
|
|
// Patterns are "provider/modelId" exact strings saved by /scoped-models
|
|
const slashIdx = pattern.indexOf('/')
|
|
if (slashIdx !== -1) {
|
|
const provider = pattern.substring(0, slashIdx)
|
|
const modelId = pattern.substring(slashIdx + 1)
|
|
const model = availableModels.find((m) => m.provider === provider && m.id === modelId)
|
|
if (model) {
|
|
const key = `${model.provider}/${model.id}`
|
|
if (!seen.has(key)) {
|
|
seen.add(key)
|
|
scopedModels.push({ model })
|
|
}
|
|
}
|
|
} else {
|
|
// Fallback: match by model id alone
|
|
const model = availableModels.find((m) => m.id === pattern)
|
|
if (model) {
|
|
const key = `${model.provider}/${model.id}`
|
|
if (!seen.has(key)) {
|
|
seen.add(key)
|
|
scopedModels.push({ model })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Only apply if we resolved some models and it's a genuine subset
|
|
if (scopedModels.length > 0 && scopedModels.length < availableModels.length) {
|
|
session.setScopedModels(scopedModels)
|
|
}
|
|
}
|
|
|
|
if (!process.stdin.isTTY) {
|
|
process.stderr.write('[gsd] Error: Interactive mode requires a terminal (TTY).\n')
|
|
process.stderr.write('[gsd] Non-interactive alternatives:\n')
|
|
process.stderr.write('[gsd] gsd --print "your message" Single-shot prompt\n')
|
|
process.stderr.write('[gsd] gsd --mode rpc JSON-RPC over stdin/stdout\n')
|
|
process.stderr.write('[gsd] gsd --mode mcp MCP server over stdin/stdout\n')
|
|
process.stderr.write('[gsd] gsd --mode text "message" Text output mode\n')
|
|
process.exit(1)
|
|
}
|
|
|
|
const interactiveMode = new InteractiveMode(session)
|
|
await interactiveMode.run()
|