pi-code 1.0.34 → 1.0.35

package/extensions/hooks/runners.ts

@@ -99,8 +99,14 @@ export const runHookCommand: HookCommandRunner = (command, payload, timeoutMs, p
     // the descendants too. CLAUDE_PROJECT_DIR is Claude's documented way for a hook to
     // reference project files regardless of the shell's cwd. CLAUDECODE=1 marks every
     // subprocess Claude spawns, so it is set on the child unconditionally.
-    const env: NodeJS.ProcessEnv = { ...process.env, CLAUDECODE: '1' }
+    // CLAUDE_CODE_CHILD_SESSION marks per-call children (hook and status line
+    // commands), never long-lived stdio MCP servers, as Claude documents; COLUMNS
+    // and LINES carry the terminal dimensions since the script's own width
+    // detection cannot see the captured terminal.
+    const env: NodeJS.ProcessEnv = { ...process.env, CLAUDECODE: '1', CLAUDE_CODE_CHILD_SESSION: '1' }
     if (projectDir) env.CLAUDE_PROJECT_DIR = projectDir
+    if (process.stdout.columns) env.COLUMNS = String(process.stdout.columns)
+    if (process.stdout.rows) env.LINES = String(process.stdout.rows)
     // An exec-form hook (an `args` array) spawns the executable directly with those args
     // and no shell, so shell metacharacters in the args arrive literally; $ARGUMENTS in
     // each arg is replaced with the event JSON by a replacer function (so $$/$& in the

package/extensions/internal/managed-settings.ts

@@ -10,6 +10,7 @@
  */
 
 import * as fs from 'node:fs'
+import * as path from 'node:path'
 
 /** The OS managed-settings.json path Claude Code documents per platform. */
 export function managedSettingsPath(platform: NodeJS.Platform = process.platform): string {
@@ -31,8 +32,7 @@ export function managedSettingsFile(): string {
   return managedSettingsFileOverride ?? managedSettingsPath()
 }
 
-/** The parsed managed settings object, or {} when absent or malformed. */
-export function readManagedSettings(file: string = managedSettingsFileOverride ?? managedSettingsPath()): Record<string, unknown> {
+function readOneSettingsFile(file: string): Record<string, unknown> {
   try {
     const parsed = JSON.parse(fs.readFileSync(file, 'utf-8'))
     if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) return parsed as Record<string, unknown>
@@ -41,3 +41,38 @@ export function readManagedSettings(file: string = managedSettingsFileOverride ?
   }
   return {}
 }
+
+function isRecordValue(value: unknown): value is Record<string, unknown> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+}
+
+/** Claude's managed-settings.d merge rules: a later single value replaces, lists
+ * combine with duplicates removed, and nested blocks merge key by key with each
+ * key following these same rules. */
+function mergeManagedKey(base: unknown, next: unknown): unknown {
+  if (Array.isArray(base) && Array.isArray(next)) return [...new Set([...base, ...next])]
+  if (isRecordValue(base) && isRecordValue(next)) {
+    const merged: Record<string, unknown> = { ...base }
+    for (const [key, value] of Object.entries(next)) merged[key] = key in merged ? mergeManagedKey(merged[key], value) : value
+    return merged
+  }
+  return next
+}
+
+/** The parsed managed settings object, or {} when absent or malformed. Claude also
+ * merges an optional managed-settings.d/ directory next to the file: every *.json
+ * in alphabetical order after the base file, hidden files and non-json ignored. */
+export function readManagedSettings(file: string = managedSettingsFileOverride ?? managedSettingsPath()): Record<string, unknown> {
+  let merged = readOneSettingsFile(file)
+  const dropInDir = path.join(path.dirname(file), 'managed-settings.d')
+  let entries: string[]
+  try {
+    entries = fs.readdirSync(dropInDir)
+  } catch {
+    return merged
+  }
+  for (const entry of entries.filter((name) => name.endsWith('.json') && !name.startsWith('.')).sort((a, b) => a.localeCompare(b, 'en'))) {
+    merged = mergeManagedKey(merged, readOneSettingsFile(path.join(dropInDir, entry))) as Record<string, unknown>
+  }
+  return merged
+}

package/extensions/mcp/transport.ts

@@ -184,7 +184,9 @@ function helperEnv(name: string, config: HttpServerConfig): NodeJS.ProcessEnv {
  * env block, and Claude's path variables (CLAUDE_PROJECT_DIR, and CLAUDE_PLUGIN_ROOT
  * for a plugin's server). */
 function stdioEnv(config: StdioServerConfig, fill: (value: string) => string, session?: SessionDirs): Record<string, string> {
-  const env: Record<string, string> = { ...getDefaultEnvironment() }
+  // CLAUDECODE marks every subprocess; the long-lived server deliberately gets no
+  // CLAUDE_CODE_CHILD_SESSION, which Claude reserves for per-call children.
+  const env: Record<string, string> = { ...getDefaultEnvironment(), CLAUDECODE: '1' }
   for (const [key, value] of Object.entries(config.env ?? {})) env[key] = fill(value)
   if (session) env.CLAUDE_PROJECT_DIR = session.projectDir
   if (config.pluginRoot !== undefined) env.CLAUDE_PLUGIN_ROOT = config.pluginRoot

package/extensions/status-line.ts

@@ -66,7 +66,8 @@ function formatCost(cost: number): string {
 
 interface RateLimitWindow {
   used_percentage: number
-  resets_at?: string
+  /** Unix epoch seconds when the window resets, per Claude's documented field. */
+  resets_at?: number
 }
 interface RateLimitSnapshot {
   five_hour?: RateLimitWindow
@@ -109,10 +110,26 @@ function readRateLimitWindow(headers: Record<string, string>, prefix: string): R
   // the computed value negative); clamp so the payload never carries a nonsense percentage.
   const window: RateLimitWindow = { used_percentage: Math.max(0, Math.min(100, usedPercentage)) }
   const resetsAt = headers[`${base}-reset`] ?? headers[`${base}-resets-at`]
-  if (resetsAt) window.resets_at = resetsAt
+  if (resetsAt) {
+    // Claude documents resets_at as Unix epoch seconds; the header carries an ISO
+    // timestamp (or, from some providers, a bare epoch number already).
+    const epoch = /^\d+$/.test(resetsAt.trim()) ? Number(resetsAt.trim()) : Math.floor(Date.parse(resetsAt) / 1000)
+    if (Number.isFinite(epoch)) window.resets_at = epoch
+  }
   return window
 }
 
+/** The snapshot with expired windows dropped, so a window whose reset time has
+ * passed never lingers in the payload; undefined when nothing remains. */
+function liveRateLimits(snapshot: RateLimitSnapshot): RateLimitSnapshot | undefined {
+  const nowSeconds = Date.now() / 1000
+  const keep = (window?: RateLimitWindow): RateLimitWindow | undefined => (window && (window.resets_at === undefined || window.resets_at > nowSeconds) ? window : undefined)
+  const fiveHour = keep(snapshot.five_hour)
+  const sevenDay = keep(snapshot.seven_day)
+  if (!fiveHour && !sevenDay) return undefined
+  return { ...(fiveHour ? { five_hour: fiveHour } : {}), ...(sevenDay ? { seven_day: sevenDay } : {}) }
+}
+
 /** The five-hour and seven-day utilization windows Claude's statusline reports,
  * from the unified rate-limit response headers. Undefined when neither is present
  * so a response without them never clobbers an earlier snapshot. */
@@ -216,7 +233,9 @@ export default function statusLine(pi: ExtensionAPI) {
       session_id: ctx.sessionManager.getSessionId(),
       cwd: ctx.cwd,
       version: PACKAGE_VERSION,
-      workspace: { current_dir: ctx.cwd, project_dir: ctx.cwd },
+      // added_dirs is always empty: pi has no /add-dir; the field stays present
+      // because Claude documents "Empty array if none have been added".
+      workspace: { current_dir: ctx.cwd, project_dir: ctx.cwd, added_dirs: [] },
       // Both fields, per Claude's documented contract: published statusline scripts
       // read .model.display_name and render the literal "null" when it is missing.
       model: { id: model?.id ?? '', display_name: model?.name ?? model?.id ?? '' },
@@ -255,13 +274,19 @@ export default function statusLine(pi: ExtensionAPI) {
     const sessionName = ctx.sessionManager.getSessionName?.()
     if (sessionName) payload.session_name = sessionName
     if (ctx.thinkingLevel) {
-      payload.effort = { level: ctx.thinkingLevel }
+      // pi's off/minimal are outside Claude's effort vocabulary: minimal maps to
+      // low, and off omits effort entirely (thinking disabled says the rest).
       payload.thinking = { enabled: ctx.thinkingLevel !== 'off' }
+      if (ctx.thinkingLevel !== 'off') payload.effort = { level: ctx.thinkingLevel === 'minimal' ? 'low' : ctx.thinkingLevel }
     }
     if (styleName) payload.output_style = { name: styleName }
     // The current utilization of the account's rate-limit windows, when the
-    // provider reported them; omitted entirely until a response has carried them.
-    if (rateLimits) payload.rate_limits = rateLimits
+    // provider reported them; omitted until a response has carried them, and an
+    // expired window is dropped rather than left stale.
+    if (rateLimits) {
+      const live = liveRateLimits(rateLimits)
+      if (live) payload.rate_limits = live
+    }
     return payload
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-code",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Claude Code experience for the pi coding agent: reads your .claude config (rules, commands, skills, hooks, output styles, MCP servers, agents) and adds todo, checkpoints, memory, web, and subagents",
   "keywords": [
     "pi",