@yagni-app/code-staging 0.2.1-staging.1038.1 → 0.2.1-staging.1039.1

package/dist/cli.d.ts

@@ -12,6 +12,27 @@
  * plus a configured pi spawn. Everything that makes this "YAGNI Code" lives in
  * pi-extension-yagni and the YAGNI backend.
  */
+/**
+ * Seed `editorPaddingX` into the per-profile pi `settings.json` so the prompt
+ * input is padded to match the chat/output area (`outputPad`) and the status
+ * bar. Fills the key in only when absent — an explicit user choice (including
+ * 0) is never overwritten. Best-effort: a missing/corrupt settings file or a
+ * write failure must never block the launch.
+ */
+/**
+ * Seed `editorPaddingX` into the per-profile pi `settings.json` so the prompt
+ * input aligns with the chat/output area (`outputPad`) and the status bar.
+ *
+ * This writes to a user-owned file, so it is deliberately conservative:
+ *  - fills the key in ONLY when absent — an explicit user choice (including 0)
+ *    is never overwritten;
+ *  - backs off on a missing-dir, corrupt, non-object, or symlinked settings
+ *    file rather than risk clobbering anything;
+ *  - writes ATOMICALLY (temp file + rename) and preserves the existing file's
+ *    permissions, so a crash mid-write can never truncate the user's settings.
+ * Any failure is swallowed: seeding must never block or break a launch.
+ */
+export declare function seedEditorPadding(piAgentDir: string): void;
 export declare const HELP_TEXT: string;
 /** Parse `use <name> [--base-url <url>]` argv into its parts. */
 export declare function parseUseArgs(args: string[]): {

package/dist/cli.js

@@ -13,7 +13,8 @@
  * pi-extension-yagni and the YAGNI backend.
  */
 import { spawn } from "node:child_process";
-import { mkdirSync, realpathSync } from "node:fs";
+import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync, } from "node:fs";
+import { join } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { PI_CONFIG_NAME } from "./branding.js";
@@ -27,6 +28,7 @@ import { runDoctor } from "./doctor.js";
 import { installProcessCrashHandlers } from "./crashReport.js";
 import { currentCliVersion, maybeNudgeAndRefresh, upgradeCommand } from "./upgrade.js";
 import { maybeRefreshAtLaunch } from "./refresh.js";
+import { PAD_X } from "./padding.js";
 import { ensureShadowPiPackage } from "./piPackage.js";
 import { resolveExtensionPath, resolvePiCliPath, resolvePiPackageDir } from "./paths.js";
 import { credentialsFromProfile, getActiveProfileName, listProfiles, migrateLegacyCredentials, persistProfileTokenRotation, profilePath, readActiveProfile, useProfile, } from "./profiles.js";
@@ -43,6 +45,72 @@ async function confirmOnTty(question) {
         rl.close();
     }
 }
+/**
+ * Seed `editorPaddingX` into the per-profile pi `settings.json` so the prompt
+ * input is padded to match the chat/output area (`outputPad`) and the status
+ * bar. Fills the key in only when absent — an explicit user choice (including
+ * 0) is never overwritten. Best-effort: a missing/corrupt settings file or a
+ * write failure must never block the launch.
+ */
+/**
+ * Seed `editorPaddingX` into the per-profile pi `settings.json` so the prompt
+ * input aligns with the chat/output area (`outputPad`) and the status bar.
+ *
+ * This writes to a user-owned file, so it is deliberately conservative:
+ *  - fills the key in ONLY when absent — an explicit user choice (including 0)
+ *    is never overwritten;
+ *  - backs off on a missing-dir, corrupt, non-object, or symlinked settings
+ *    file rather than risk clobbering anything;
+ *  - writes ATOMICALLY (temp file + rename) and preserves the existing file's
+ *    permissions, so a crash mid-write can never truncate the user's settings.
+ * Any failure is swallowed: seeding must never block or break a launch.
+ */
+export function seedEditorPadding(piAgentDir) {
+    try {
+        const settingsPath = join(piAgentDir, "settings.json");
+        let settings = {};
+        let existingMode;
+        if (existsSync(settingsPath)) {
+            // Refuse to follow a symlink: we must only ever write a regular, real
+            // settings file the user (or pi) owns.
+            if (lstatSync(settingsPath).isSymbolicLink())
+                return;
+            let parsed;
+            try {
+                parsed = JSON.parse(readFileSync(settingsPath, "utf8"));
+            }
+            catch {
+                return; // corrupt file: back off rather than clobber the user's settings
+            }
+            if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+                return; // non-object settings: leave it alone
+            }
+            settings = parsed;
+            existingMode = lstatSync(settingsPath).mode & 0o777;
+        }
+        if (settings.editorPaddingX !== undefined)
+            return; // user already chose
+        settings.editorPaddingX = PAD_X;
+        // Atomic write: serialize to a temp file in the same directory, then
+        // rename over the target. A crash leaves either the old file or the temp
+        // file, never a half-written settings.json.
+        const tmpPath = join(piAgentDir, `.settings.json.yagni-${process.pid}-${Date.now()}.tmp`);
+        try {
+            writeFileSync(tmpPath, `${JSON.stringify(settings, null, 2)}\n`, { mode: 0o600 });
+            renameSync(tmpPath, settingsPath);
+        }
+        finally {
+            rmSync(tmpPath, { force: true }); // no-op once the rename succeeded
+        }
+        // Restore the original permissions if the file already had them (rename
+        // replaces the inode, which would otherwise reset to 0600).
+        if (existingMode !== undefined)
+            chmodSync(settingsPath, existingMode);
+    }
+    catch {
+        // never block launch on a settings-seed failure
+    }
+}
 async function runDefault(passthroughArgs) {
     // Cache-backed update nudge (never a network wait), then a background cache
     // refresh that completes while the session runs. Both fail soft.
@@ -72,6 +140,11 @@ async function runDefault(passthroughArgs) {
     // instead of ~/.pi/agent, and prod state never bleeds into staging.
     const piAgentDir = agentDir(profile.name);
     mkdirSync(piAgentDir, { recursive: true, mode: 0o700 });
+    // Seed the editor's horizontal padding so the prompt input aligns with the
+    // chat/output area and the status bar. Only fills in when the user has not
+    // set it themselves — an explicit choice is never clobbered. Best-effort: a
+    // corrupt or unreadable settings.json must never block the launch.
+    seedEditorPadding(piAgentDir);
     // Generate the shadow pi package so the terminal title/process name read
     // "YAGNI Code" instead of "pi"/"π". Best-effort: if it can't be built we
     // still launch (un-rebranded but hermetic), never blocking the agent.

package/dist/extension/footer.d.ts

@@ -40,6 +40,14 @@
  */
 import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
 export declare const BRANCH_MAX_WIDTH = 60;
+/**
+ * Resolve the status bar's left pad from the launcher's `YAGNI_PAD_X` env so it
+ * aligns with the editor input and the chat/output area on one shared column.
+ * The launcher seeds the same value as pi's `editorPaddingX`; this footer can't
+ * read pi settings, so the value crosses over env. Falls back to the output
+ * area's default (1) when unset/invalid. Clamped to pi's 0–3 editor range.
+ */
+export declare function resolveFooterPadX(raw?: string | undefined): number;
 /** Format token counts for compact footer display (mirrors pi's formatTokens). */
 export declare function formatTokens(count: number): string;
 /** Shorten cwd relative to home, like pi's built-in footer. */
@@ -85,7 +93,7 @@ export declare function renderFooterLines(input: {
     usage: UsageTotals;
     contextPercent: number | null;
     statuses: string[];
-}, theme: Pick<Theme, "fg">, width: number): string[];
+}, theme: Pick<Theme, "fg">, width: number, padX?: number): string[];
 /**
  * Create a footer factory that captures the session `ctx` (for session data)
  * and returns the component `setFooter` expects. Called from the

package/dist/extension/footer.js

@@ -46,6 +46,19 @@ export const BRANCH_MAX_WIDTH = 60;
 const WORKTREE_MAX_WIDTH = 30;
 /** Section separator: single space + middle dot + single space. */
 const SEP = " · ";
+/** Default horizontal pad when the launcher didn't forward one (matches outputPad=1). */
+const DEFAULT_PAD_X = 1;
+/**
+ * Resolve the status bar's left pad from the launcher's `YAGNI_PAD_X` env so it
+ * aligns with the editor input and the chat/output area on one shared column.
+ * The launcher seeds the same value as pi's `editorPaddingX`; this footer can't
+ * read pi settings, so the value crosses over env. Falls back to the output
+ * area's default (1) when unset/invalid. Clamped to pi's 0–3 editor range.
+ */
+export function resolveFooterPadX(raw = process.env.YAGNI_PAD_X) {
+    const n = raw === undefined ? NaN : Number.parseInt(raw, 10);
+    return Number.isFinite(n) && n >= 0 && n <= 3 ? n : DEFAULT_PAD_X;
+}
 /** Format token counts for compact footer display (mirrors pi's formatTokens). */
 export function formatTokens(count) {
     if (count < 1000)
@@ -191,9 +204,14 @@ function contextColor(percent) {
     return "dim";
 }
 /** Pure line-builder, exported for tests. All data injected; colors via theme. */
-export function renderFooterLines(input, theme, width) {
+export function renderFooterLines(input, theme, width, padX = 0) {
     const dim = (s) => theme.fg("dim", s);
     const sep = dim(SEP);
+    // Reserve the left pad so the status bar's text starts on the same column as
+    // the (padded) editor input and the chat/output area, instead of hugging the
+    // terminal edge. Truncation runs against the reduced content width.
+    const pad = " ".repeat(Math.max(0, Math.min(3, Math.floor(padX))));
+    const contentWidth = Math.max(1, width - pad.length);
     // Line 1: folder · [worktree] · branch
     const line1Parts = [theme.fg("accent", input.git.folder)];
     if (input.git.inRepo) {
@@ -202,7 +220,7 @@ export function renderFooterLines(input, theme, width) {
         if (input.git.branch)
             line1Parts.push(theme.fg("border", truncateEnd(input.git.branch, BRANCH_MAX_WIDTH)));
     }
-    const line1 = truncateToWidth(line1Parts.join(sep), width, dim("…"));
+    const line1 = pad + truncateToWidth(line1Parts.join(sep), contentWidth, dim("…"));
     // Line 2: model · ↑in ↓out $cost · ctx%
     const statParts = [];
     if (input.usage.input)
@@ -217,12 +235,12 @@ export function renderFooterLines(input, theme, width) {
     if (stats)
         line2Parts.push(dim(stats));
     line2Parts.push(theme.fg(contextColor(input.contextPercent), percentText));
-    const line2 = truncateToWidth(line2Parts.join(sep), width, dim("…"));
+    const line2 = pad + truncateToWidth(line2Parts.join(sep), contentWidth, dim("…"));
     // Line 3: extension statuses (branding, todo counter, mode), joined by " · ".
     const statuses = input.statuses.map((s) => s.replace(/[\r\n\t]/g, " ").trim()).filter(Boolean);
     const lines = [line1, line2];
     if (statuses.length > 0) {
-        lines.push(truncateToWidth(dim(statuses.join(SEP)), width, dim("…")));
+        lines.push(pad + truncateToWidth(dim(statuses.join(SEP)), contentWidth, dim("…")));
     }
     return lines;
 }
@@ -258,7 +276,7 @@ export function createYagniFooterFactory(ctx) {
                     usage: collectUsage(ctx.sessionManager),
                     contextPercent: ctx.getContextUsage()?.percent ?? null,
                     statuses,
-                }, theme, width);
+                }, theme, width, resolveFooterPadX());
             },
             invalidate() {
                 gitCache = undefined;

package/dist/launch.js

@@ -7,6 +7,7 @@
  */
 import { randomUUID } from "node:crypto";
 import { agentDirEnvVar } from "./branding.js";
+import { PAD_X_ENV, resolvePadX } from "./padding.js";
 /**
  * How close to expiry the token can be before launch warns. A coding session
  * easily outlives a token, so warn early enough that re-logging in before a long
@@ -95,6 +96,10 @@ export function buildLaunch(creds, passthroughArgs, opts) {
         // Match the e2b harness defaults: skip pi's update check + telemetry.
         PI_SKIP_VERSION_CHECK: "1",
         PI_TELEMETRY: "0",
+        // Forward the chosen horizontal pad so the extension's footer aligns with
+        // the editor (which the launcher pads by seeding editorPaddingX). The
+        // footer can't read pi's settings, so the value crosses over env.
+        [PAD_X_ENV]: String(resolvePadX()),
     };
     // Always load our extension. Default the provider to `yagni` unless the user
     // explicitly chose one (so power users can still point pi elsewhere).

package/dist/padding.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Single source of truth for the CLI's horizontal padding, shared by the
+ * launcher (which seeds the editor setting) and — via the `YAGNI_PAD_X` env the
+ * launcher forwards — pi-extension-yagni's footer.
+ *
+ * The value must match pi's `outputPad` (the chat/output area's left+right
+ * padding, which defaults to 1) so the input editor, the output stream, and
+ * the status bar all align on the same column. Keeping it in one module makes
+ * the coherence structural rather than eyeballed: change this one number and
+ * the editor, footer, and seeded default move together.
+ *
+ * Separators (the ─ rules above/below the input) intentionally stay full-bleed
+ * and are NOT padded — matching Claude Code's frame.
+ */
+export declare const PAD_X = 1;
+/** Left (and right) padding string applied to the editor and footer. */
+export declare const PAD_STR: string;
+/** Env var the launcher sets so the extension's footer can match the editor pad. */
+export declare const PAD_X_ENV = "YAGNI_PAD_X";
+/** Parse a pad width from the env override, falling back to {@link PAD_X}. */
+export declare function resolvePadX(raw?: string | undefined): number;
+//# sourceMappingURL=padding.d.ts.map

package/dist/padding.js

@@ -0,0 +1,25 @@
+/**
+ * Single source of truth for the CLI's horizontal padding, shared by the
+ * launcher (which seeds the editor setting) and — via the `YAGNI_PAD_X` env the
+ * launcher forwards — pi-extension-yagni's footer.
+ *
+ * The value must match pi's `outputPad` (the chat/output area's left+right
+ * padding, which defaults to 1) so the input editor, the output stream, and
+ * the status bar all align on the same column. Keeping it in one module makes
+ * the coherence structural rather than eyeballed: change this one number and
+ * the editor, footer, and seeded default move together.
+ *
+ * Separators (the ─ rules above/below the input) intentionally stay full-bleed
+ * and are NOT padded — matching Claude Code's frame.
+ */
+export const PAD_X = 1;
+/** Left (and right) padding string applied to the editor and footer. */
+export const PAD_STR = " ".repeat(PAD_X);
+/** Env var the launcher sets so the extension's footer can match the editor pad. */
+export const PAD_X_ENV = "YAGNI_PAD_X";
+/** Parse a pad width from the env override, falling back to {@link PAD_X}. */
+export function resolvePadX(raw = process.env[PAD_X_ENV]) {
+    const n = raw === undefined ? NaN : Number.parseInt(raw, 10);
+    return Number.isFinite(n) && n >= 0 && n <= 3 ? n : PAD_X;
+}
+//# sourceMappingURL=padding.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "0.2.1-staging.1038.1",
+  "version": "0.2.1-staging.1039.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -38,5 +38,5 @@
     "@earendil-works/pi-tui": "0.83.0",
     "typebox": "^1.1.38"
   },
-  "yagniSourceSha": "4493e421b21ba86ed37645beecef7c9a74799f4b"
+  "yagniSourceSha": "82c8e819af017a1a2c5c93aea5b4f96690f267d3"
 }