lsd-pi 1.0.0 → 1.1.1

package/packages/pi-coding-agent/dist/modes/interactive/theme/themes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA0L5C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAmB,CAAC"}
+{"version":3,"file":"themes.d.ts","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAkM5C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAmB,CAAC"}

package/packages/pi-coding-agent/dist/modes/interactive/theme/themes.js

@@ -13,17 +13,20 @@
 const dark = {
     name: "dark",
     vars: {
-        cyan: "#c85520",
-        blue: "#4a5568",
+        cyan: "#4a8cf7",
+        blue: "#4a8cf7",
         green: "#b5bd68",
         red: "#cc6666",
-        yellow: "#ffff00",
+        yellow: "#facc15",
         gray: "#bec8d6",
         dimGray: "#8793a3",
         darkGray: "#505050",
-        accent: "#c85520",
-        // Muted orange — used for input borders (weaker than full accent)
-        orangeDim: "#502810",
+        accent: "#60a5fa",
+        blueMuted: "#1e3a8a",
+        blueLow: "#2563eb",
+        blueMedium: "#4a8cf7",
+        blueHigh: "#60a5fa",
+        blueXhigh: "#93c5fd",
         selectedBg: "#323640",
         userMsgBg: "#252930",
         toolPendingBg: "#2b2f38",
@@ -35,7 +38,7 @@ const dark = {
         accent: "accent",
         border: "blue",
         borderAccent: "cyan",
-        borderMuted: "orangeDim",
+        borderMuted: "blue",
         success: "green",
         error: "red",
         warning: "yellow",
@@ -76,12 +79,12 @@ const dark = {
         syntaxType: "#4EC9B0",
         syntaxOperator: "#D4D4D4",
         syntaxPunctuation: "#D4D4D4",
-        thinkingOff: "orangeDim",
-        thinkingMinimal: "#6a3818",
-        thinkingLow: "#8a4c22",
-        thinkingMedium: "#a85c2a",
-        thinkingHigh: "#c06830",
-        thinkingXhigh: "#d47838",
+        thinkingOff: "blueMuted",
+        thinkingMinimal: "blueLow",
+        thinkingLow: "blueMedium",
+        thinkingMedium: "blueHigh",
+        thinkingHigh: "blueXhigh",
+        thinkingXhigh: "cyan",
         bashMode: "green",
     },
     export: {
@@ -96,15 +99,20 @@ const dark = {
 const light = {
     name: "light",
     vars: {
-        teal: "#c85a18",
+        teal: "#3b82f6",
         blue: "#547da7",
         green: "#588458",
         red: "#aa5555",
-        yellow: "#9a7326",
+        yellow: "#eab308",
         warning: "#7a5a00",
         mediumGray: "#6c6c6c",
         dimGray: "#767676",
         lightGray: "#b0b0b0",
+        blueMuted: "#6b8fb8",
+        blueLow: "#547da7",
+        blueMedium: "#3b82f6",
+        blueHigh: "#2563eb",
+        blueXhigh: "#1d4ed8",
         selectedBg: "#d0d0e0",
         userMsgBg: "#e8e8e8",
         toolPendingBg: "#e8e8f0",
@@ -157,12 +165,12 @@ const light = {
         syntaxType: "#267F99",
         syntaxOperator: "#000000",
         syntaxPunctuation: "#000000",
-        thinkingOff: "lightGray",
-        thinkingMinimal: "#b87840",
-        thinkingLow: "#a06030",
+        thinkingOff: "blueMuted",
+        thinkingMinimal: "blueLow",
+        thinkingLow: "blueMedium",
         thinkingMedium: "teal",
-        thinkingHigh: "#8a4820",
-        thinkingXhigh: "#6a3010",
+        thinkingHigh: "blueHigh",
+        thinkingXhigh: "blueXhigh",
         bashMode: "green",
     },
     export: {

package/packages/pi-coding-agent/dist/modes/interactive/theme/themes.js.map

@@ -1 +1 @@
-{"version":3,"file":"themes.js","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E,MAAM,IAAI,GAAc;IACvB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;QACjB,kEAAkE;QAClE,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,SAAS;KACtB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM;QACd,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,MAAM;QACb,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,MAAM;QAEpB,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,EAAE;QACnB,eAAe,EAAE,aAAa;QAC9B,iBAAiB,EAAE,EAAE;QACrB,kBAAkB,EAAE,SAAS;QAC7B,aAAa,EAAE,eAAe;QAC9B,aAAa,EAAE,eAAe;QAC9B,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,MAAM;QAElB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,OAAO;QACpB,iBAAiB,EAAE,MAAM;QACzB,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,MAAM;QACrB,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,QAAQ;QAEtB,aAAa,EAAE,OAAO;QACtB,eAAe,EAAE,KAAK;QACtB,eAAe,EAAE,MAAM;QAEvB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,cAAc,EAAE,SAAS;QACzB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,SAAS;QACvB,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,SAAS;QACzB,iBAAiB,EAAE,SAAS;QAE5B,WAAW,EAAE,WAAW;QACxB,eAAe,EAAE,SAAS;QAC1B,WAAW,EAAE,SAAS;QACtB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,SAAS;QACvB,aAAa,EAAE,SAAS;QAExB,QAAQ,EAAE,OAAO;KACjB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;KACjB;CACD,CAAC;AAEF,8EAA8E;AAC9E,cAAc;AACd,8EAA8E;AAE9E,MAAM,KAAK,GAAc;IACxB,IAAI,EAAE,OAAO;IACb,IAAI,EAAE;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,SAAS;KACtB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,YAAY;QACnB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,YAAY;QAE1B,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,EAAE;QACnB,eAAe,EAAE,aAAa;QAC9B,iBAAiB,EAAE,EAAE;QACrB,kBAAkB,EAAE,SAAS;QAC7B,aAAa,EAAE,eAAe;QAC9B,aAAa,EAAE,eAAe;QAC9B,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,YAAY;QAExB,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,OAAO;QACpB,iBAAiB,EAAE,YAAY;QAC/B,OAAO,EAAE,YAAY;QACrB,aAAa,EAAE,YAAY;QAC3B,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,OAAO;QAErB,aAAa,EAAE,OAAO;QACtB,eAAe,EAAE,KAAK;QACtB,eAAe,EAAE,YAAY;QAE7B,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,cAAc,EAAE,SAAS;QACzB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,SAAS;QACvB,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,SAAS;QACzB,iBAAiB,EAAE,SAAS;QAE5B,WAAW,EAAE,WAAW;QACxB,eAAe,EAAE,SAAS;QAC1B,WAAW,EAAE,SAAS;QACtB,cAAc,EAAE,MAAM;QACtB,YAAY,EAAE,SAAS;QACvB,aAAa,EAAE,SAAS;QAExB,QAAQ,EAAE,OAAO;KACjB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;KACjB;CACD,CAAC;AAEF,8EAA8E;AAC9E,SAAS;AACT,8EAA8E;AAE9E,MAAM,CAAC,MAAM,aAAa,GAA8B,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC","sourcesContent":["/**\n * Built-in theme definitions.\n *\n * Each theme is a self-contained record of color values. Variable references\n * (e.g. \"accent\") are resolved against the `vars` map at load time by the\n * theme engine in theme.ts.\n *\n * To add a new built-in theme, add an entry to `builtinThemes` below.\n */\n\n// Re-use the ThemeJson type from the schema defined in theme.ts.\n// We import only the type to avoid circular runtime dependencies.\nimport type { ThemeJson } from \"./theme.js\";\n\n// ---------------------------------------------------------------------------\n// Dark theme\n// ---------------------------------------------------------------------------\n\nconst dark: ThemeJson = {\n\tname: \"dark\",\n\tvars: {\n\t\tcyan: \"#c85520\",\n\t\tblue: \"#4a5568\",\n\t\tgreen: \"#b5bd68\",\n\t\tred: \"#cc6666\",\n\t\tyellow: \"#ffff00\",\n\t\tgray: \"#bec8d6\",\n\t\tdimGray: \"#8793a3\",\n\t\tdarkGray: \"#505050\",\n\t\taccent: \"#c85520\",\n\t\t// Muted orange — used for input borders (weaker than full accent)\n\t\torangeDim: \"#502810\",\n\t\tselectedBg: \"#323640\",\n\t\tuserMsgBg: \"#252930\",\n\t\ttoolPendingBg: \"#2b2f38\",\n\t\ttoolSuccessBg: \"#283228\",\n\t\ttoolErrorBg: \"#3c2828\",\n\t\tcustomMsgBg: \"#2d2838\",\n\t},\n\tcolors: {\n\t\taccent: \"accent\",\n\t\tborder: \"blue\",\n\t\tborderAccent: \"cyan\",\n\t\tborderMuted: \"orangeDim\",\n\t\tsuccess: \"green\",\n\t\terror: \"red\",\n\t\twarning: \"yellow\",\n\t\tmuted: \"gray\",\n\t\tdim: \"dimGray\",\n\t\ttext: \"\",\n\t\tthinkingText: \"gray\",\n\n\t\tselectedBg: \"selectedBg\",\n\t\tuserMessageBg: \"userMsgBg\",\n\t\tuserMessageText: \"\",\n\t\tcustomMessageBg: \"customMsgBg\",\n\t\tcustomMessageText: \"\",\n\t\tcustomMessageLabel: \"#9575cd\",\n\t\ttoolPendingBg: \"toolPendingBg\",\n\t\ttoolSuccessBg: \"toolSuccessBg\",\n\t\ttoolErrorBg: \"toolErrorBg\",\n\t\ttoolTitle: \"\",\n\t\ttoolOutput: \"gray\",\n\n\t\tmdHeading: \"#f0c674\",\n\t\tmdLink: \"#5a8aaa\",\n\t\tmdLinkUrl: \"dimGray\",\n\t\tmdCode: \"accent\",\n\t\tmdCodeBlock: \"green\",\n\t\tmdCodeBlockBorder: \"gray\",\n\t\tmdQuote: \"gray\",\n\t\tmdQuoteBorder: \"gray\",\n\t\tmdHr: \"gray\",\n\t\tmdListBullet: \"accent\",\n\n\t\ttoolDiffAdded: \"green\",\n\t\ttoolDiffRemoved: \"red\",\n\t\ttoolDiffContext: \"gray\",\n\n\t\tsyntaxComment: \"#6A9955\",\n\t\tsyntaxKeyword: \"#569CD6\",\n\t\tsyntaxFunction: \"#DCDCAA\",\n\t\tsyntaxVariable: \"#9CDCFE\",\n\t\tsyntaxString: \"#CE9178\",\n\t\tsyntaxNumber: \"#B5CEA8\",\n\t\tsyntaxType: \"#4EC9B0\",\n\t\tsyntaxOperator: \"#D4D4D4\",\n\t\tsyntaxPunctuation: \"#D4D4D4\",\n\n\t\tthinkingOff: \"orangeDim\",\n\t\tthinkingMinimal: \"#6a3818\",\n\t\tthinkingLow: \"#8a4c22\",\n\t\tthinkingMedium: \"#a85c2a\",\n\t\tthinkingHigh: \"#c06830\",\n\t\tthinkingXhigh: \"#d47838\",\n\n\t\tbashMode: \"green\",\n\t},\n\texport: {\n\t\tpageBg: \"#18181e\",\n\t\tcardBg: \"#1e1e24\",\n\t\tinfoBg: \"#3c3728\",\n\t},\n};\n\n// ---------------------------------------------------------------------------\n// Light theme\n// ---------------------------------------------------------------------------\n\nconst light: ThemeJson = {\n\tname: \"light\",\n\tvars: {\n\t\tteal: \"#c85a18\",\n\t\tblue: \"#547da7\",\n\t\tgreen: \"#588458\",\n\t\tred: \"#aa5555\",\n\t\tyellow: \"#9a7326\",\n\t\twarning: \"#7a5a00\",\n\t\tmediumGray: \"#6c6c6c\",\n\t\tdimGray: \"#767676\",\n\t\tlightGray: \"#b0b0b0\",\n\t\tselectedBg: \"#d0d0e0\",\n\t\tuserMsgBg: \"#e8e8e8\",\n\t\ttoolPendingBg: \"#e8e8f0\",\n\t\ttoolSuccessBg: \"#e8f0e8\",\n\t\ttoolErrorBg: \"#f0e8e8\",\n\t\tcustomMsgBg: \"#ede7f6\",\n\t},\n\tcolors: {\n\t\taccent: \"teal\",\n\t\tborder: \"blue\",\n\t\tborderAccent: \"teal\",\n\t\tborderMuted: \"lightGray\",\n\t\tsuccess: \"green\",\n\t\terror: \"red\",\n\t\twarning: \"warning\",\n\t\tmuted: \"mediumGray\",\n\t\tdim: \"dimGray\",\n\t\ttext: \"\",\n\t\tthinkingText: \"mediumGray\",\n\n\t\tselectedBg: \"selectedBg\",\n\t\tuserMessageBg: \"userMsgBg\",\n\t\tuserMessageText: \"\",\n\t\tcustomMessageBg: \"customMsgBg\",\n\t\tcustomMessageText: \"\",\n\t\tcustomMessageLabel: \"#7e57c2\",\n\t\ttoolPendingBg: \"toolPendingBg\",\n\t\ttoolSuccessBg: \"toolSuccessBg\",\n\t\ttoolErrorBg: \"toolErrorBg\",\n\t\ttoolTitle: \"\",\n\t\ttoolOutput: \"mediumGray\",\n\n\t\tmdHeading: \"yellow\",\n\t\tmdLink: \"blue\",\n\t\tmdLinkUrl: \"dimGray\",\n\t\tmdCode: \"teal\",\n\t\tmdCodeBlock: \"green\",\n\t\tmdCodeBlockBorder: \"mediumGray\",\n\t\tmdQuote: \"mediumGray\",\n\t\tmdQuoteBorder: \"mediumGray\",\n\t\tmdHr: \"mediumGray\",\n\t\tmdListBullet: \"green\",\n\n\t\ttoolDiffAdded: \"green\",\n\t\ttoolDiffRemoved: \"red\",\n\t\ttoolDiffContext: \"mediumGray\",\n\n\t\tsyntaxComment: \"#008000\",\n\t\tsyntaxKeyword: \"#0000FF\",\n\t\tsyntaxFunction: \"#795E26\",\n\t\tsyntaxVariable: \"#001080\",\n\t\tsyntaxString: \"#A31515\",\n\t\tsyntaxNumber: \"#098658\",\n\t\tsyntaxType: \"#267F99\",\n\t\tsyntaxOperator: \"#000000\",\n\t\tsyntaxPunctuation: \"#000000\",\n\n\t\tthinkingOff: \"lightGray\",\n\t\tthinkingMinimal: \"#b87840\",\n\t\tthinkingLow: \"#a06030\",\n\t\tthinkingMedium: \"teal\",\n\t\tthinkingHigh: \"#8a4820\",\n\t\tthinkingXhigh: \"#6a3010\",\n\n\t\tbashMode: \"green\",\n\t},\n\texport: {\n\t\tpageBg: \"#f8f8f8\",\n\t\tcardBg: \"#ffffff\",\n\t\tinfoBg: \"#fffae6\",\n\t},\n};\n\n// ---------------------------------------------------------------------------\n// Export\n// ---------------------------------------------------------------------------\n\nexport const builtinThemes: Record<string, ThemeJson> = { dark, light };\n"]}
+{"version":3,"file":"themes.js","sourceRoot":"","sources":["../../../../src/modes/interactive/theme/themes.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E,MAAM,IAAI,GAAc;IACvB,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,SAAS;KACtB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,MAAM;QACd,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,QAAQ;QACjB,KAAK,EAAE,MAAM;QACb,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,MAAM;QAEpB,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,EAAE;QACnB,eAAe,EAAE,aAAa;QAC9B,iBAAiB,EAAE,EAAE;QACrB,kBAAkB,EAAE,SAAS;QAC7B,aAAa,EAAE,eAAe;QAC9B,aAAa,EAAE,eAAe;QAC9B,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,MAAM;QAElB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,QAAQ;QAChB,WAAW,EAAE,OAAO;QACpB,iBAAiB,EAAE,MAAM;QACzB,OAAO,EAAE,MAAM;QACf,aAAa,EAAE,MAAM;QACrB,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,QAAQ;QAEtB,aAAa,EAAE,OAAO;QACtB,eAAe,EAAE,KAAK;QACtB,eAAe,EAAE,MAAM;QAEvB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,cAAc,EAAE,SAAS;QACzB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,SAAS;QACvB,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,SAAS;QACzB,iBAAiB,EAAE,SAAS;QAE5B,WAAW,EAAE,WAAW;QACxB,eAAe,EAAE,SAAS;QAC1B,WAAW,EAAE,YAAY;QACzB,cAAc,EAAE,UAAU;QAC1B,YAAY,EAAE,WAAW;QACzB,aAAa,EAAE,MAAM;QAErB,QAAQ,EAAE,OAAO;KACjB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;KACjB;CACD,CAAC;AAEF,8EAA8E;AAC9E,cAAc;AACd,8EAA8E;AAE9E,MAAM,KAAK,GAAc;IACxB,IAAI,EAAE,OAAO;IACb,IAAI,EAAE;QACL,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,OAAO,EAAE,SAAS;QAClB,SAAS,EAAE,SAAS;QACpB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,SAAS;QACpB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,SAAS;KACtB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,YAAY,EAAE,MAAM;QACpB,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,KAAK;QACZ,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,YAAY;QACnB,GAAG,EAAE,SAAS;QACd,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,YAAY;QAE1B,UAAU,EAAE,YAAY;QACxB,aAAa,EAAE,WAAW;QAC1B,eAAe,EAAE,EAAE;QACnB,eAAe,EAAE,aAAa;QAC9B,iBAAiB,EAAE,EAAE;QACrB,kBAAkB,EAAE,SAAS;QAC7B,aAAa,EAAE,eAAe;QAC9B,aAAa,EAAE,eAAe;QAC9B,WAAW,EAAE,aAAa;QAC1B,SAAS,EAAE,EAAE;QACb,UAAU,EAAE,YAAY;QAExB,SAAS,EAAE,QAAQ;QACnB,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,MAAM;QACd,WAAW,EAAE,OAAO;QACpB,iBAAiB,EAAE,YAAY;QAC/B,OAAO,EAAE,YAAY;QACrB,aAAa,EAAE,YAAY;QAC3B,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,OAAO;QAErB,aAAa,EAAE,OAAO;QACtB,eAAe,EAAE,KAAK;QACtB,eAAe,EAAE,YAAY;QAE7B,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,SAAS;QACxB,cAAc,EAAE,SAAS;QACzB,cAAc,EAAE,SAAS;QACzB,YAAY,EAAE,SAAS;QACvB,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,SAAS;QACzB,iBAAiB,EAAE,SAAS;QAE5B,WAAW,EAAE,WAAW;QACxB,eAAe,EAAE,SAAS;QAC1B,WAAW,EAAE,YAAY;QACzB,cAAc,EAAE,MAAM;QACtB,YAAY,EAAE,UAAU;QACxB,aAAa,EAAE,WAAW;QAE1B,QAAQ,EAAE,OAAO;KACjB;IACD,MAAM,EAAE;QACP,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,SAAS;KACjB;CACD,CAAC;AAEF,8EAA8E;AAC9E,SAAS;AACT,8EAA8E;AAE9E,MAAM,CAAC,MAAM,aAAa,GAA8B,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC","sourcesContent":["/**\n * Built-in theme definitions.\n *\n * Each theme is a self-contained record of color values. Variable references\n * (e.g. \"accent\") are resolved against the `vars` map at load time by the\n * theme engine in theme.ts.\n *\n * To add a new built-in theme, add an entry to `builtinThemes` below.\n */\n\n// Re-use the ThemeJson type from the schema defined in theme.ts.\n// We import only the type to avoid circular runtime dependencies.\nimport type { ThemeJson } from \"./theme.js\";\n\n// ---------------------------------------------------------------------------\n// Dark theme\n// ---------------------------------------------------------------------------\n\nconst dark: ThemeJson = {\n\tname: \"dark\",\n\tvars: {\n\t\tcyan: \"#4a8cf7\",\n\t\tblue: \"#4a8cf7\",\n\t\tgreen: \"#b5bd68\",\n\t\tred: \"#cc6666\",\n\t\tyellow: \"#facc15\",\n\t\tgray: \"#bec8d6\",\n\t\tdimGray: \"#8793a3\",\n\t\tdarkGray: \"#505050\",\n\t\taccent: \"#60a5fa\",\n\t\tblueMuted: \"#1e3a8a\",\n\t\tblueLow: \"#2563eb\",\n\t\tblueMedium: \"#4a8cf7\",\n\t\tblueHigh: \"#60a5fa\",\n\t\tblueXhigh: \"#93c5fd\",\n\t\tselectedBg: \"#323640\",\n\t\tuserMsgBg: \"#252930\",\n\t\ttoolPendingBg: \"#2b2f38\",\n\t\ttoolSuccessBg: \"#283228\",\n\t\ttoolErrorBg: \"#3c2828\",\n\t\tcustomMsgBg: \"#2d2838\",\n\t},\n\tcolors: {\n\t\taccent: \"accent\",\n\t\tborder: \"blue\",\n\t\tborderAccent: \"cyan\",\n\t\tborderMuted: \"blue\",\n\t\tsuccess: \"green\",\n\t\terror: \"red\",\n\t\twarning: \"yellow\",\n\t\tmuted: \"gray\",\n\t\tdim: \"dimGray\",\n\t\ttext: \"\",\n\t\tthinkingText: \"gray\",\n\n\t\tselectedBg: \"selectedBg\",\n\t\tuserMessageBg: \"userMsgBg\",\n\t\tuserMessageText: \"\",\n\t\tcustomMessageBg: \"customMsgBg\",\n\t\tcustomMessageText: \"\",\n\t\tcustomMessageLabel: \"#9575cd\",\n\t\ttoolPendingBg: \"toolPendingBg\",\n\t\ttoolSuccessBg: \"toolSuccessBg\",\n\t\ttoolErrorBg: \"toolErrorBg\",\n\t\ttoolTitle: \"\",\n\t\ttoolOutput: \"gray\",\n\n\t\tmdHeading: \"#f0c674\",\n\t\tmdLink: \"#5a8aaa\",\n\t\tmdLinkUrl: \"dimGray\",\n\t\tmdCode: \"accent\",\n\t\tmdCodeBlock: \"green\",\n\t\tmdCodeBlockBorder: \"gray\",\n\t\tmdQuote: \"gray\",\n\t\tmdQuoteBorder: \"gray\",\n\t\tmdHr: \"gray\",\n\t\tmdListBullet: \"accent\",\n\n\t\ttoolDiffAdded: \"green\",\n\t\ttoolDiffRemoved: \"red\",\n\t\ttoolDiffContext: \"gray\",\n\n\t\tsyntaxComment: \"#6A9955\",\n\t\tsyntaxKeyword: \"#569CD6\",\n\t\tsyntaxFunction: \"#DCDCAA\",\n\t\tsyntaxVariable: \"#9CDCFE\",\n\t\tsyntaxString: \"#CE9178\",\n\t\tsyntaxNumber: \"#B5CEA8\",\n\t\tsyntaxType: \"#4EC9B0\",\n\t\tsyntaxOperator: \"#D4D4D4\",\n\t\tsyntaxPunctuation: \"#D4D4D4\",\n\n\t\tthinkingOff: \"blueMuted\",\n\t\tthinkingMinimal: \"blueLow\",\n\t\tthinkingLow: \"blueMedium\",\n\t\tthinkingMedium: \"blueHigh\",\n\t\tthinkingHigh: \"blueXhigh\",\n\t\tthinkingXhigh: \"cyan\",\n\n\t\tbashMode: \"green\",\n\t},\n\texport: {\n\t\tpageBg: \"#18181e\",\n\t\tcardBg: \"#1e1e24\",\n\t\tinfoBg: \"#3c3728\",\n\t},\n};\n\n// ---------------------------------------------------------------------------\n// Light theme\n// ---------------------------------------------------------------------------\n\nconst light: ThemeJson = {\n\tname: \"light\",\n\tvars: {\n\t\tteal: \"#3b82f6\",\n\t\tblue: \"#547da7\",\n\t\tgreen: \"#588458\",\n\t\tred: \"#aa5555\",\n\t\tyellow: \"#eab308\",\n\t\twarning: \"#7a5a00\",\n\t\tmediumGray: \"#6c6c6c\",\n\t\tdimGray: \"#767676\",\n\t\tlightGray: \"#b0b0b0\",\n\t\tblueMuted: \"#6b8fb8\",\n\t\tblueLow: \"#547da7\",\n\t\tblueMedium: \"#3b82f6\",\n\t\tblueHigh: \"#2563eb\",\n\t\tblueXhigh: \"#1d4ed8\",\n\t\tselectedBg: \"#d0d0e0\",\n\t\tuserMsgBg: \"#e8e8e8\",\n\t\ttoolPendingBg: \"#e8e8f0\",\n\t\ttoolSuccessBg: \"#e8f0e8\",\n\t\ttoolErrorBg: \"#f0e8e8\",\n\t\tcustomMsgBg: \"#ede7f6\",\n\t},\n\tcolors: {\n\t\taccent: \"teal\",\n\t\tborder: \"blue\",\n\t\tborderAccent: \"teal\",\n\t\tborderMuted: \"lightGray\",\n\t\tsuccess: \"green\",\n\t\terror: \"red\",\n\t\twarning: \"warning\",\n\t\tmuted: \"mediumGray\",\n\t\tdim: \"dimGray\",\n\t\ttext: \"\",\n\t\tthinkingText: \"mediumGray\",\n\n\t\tselectedBg: \"selectedBg\",\n\t\tuserMessageBg: \"userMsgBg\",\n\t\tuserMessageText: \"\",\n\t\tcustomMessageBg: \"customMsgBg\",\n\t\tcustomMessageText: \"\",\n\t\tcustomMessageLabel: \"#7e57c2\",\n\t\ttoolPendingBg: \"toolPendingBg\",\n\t\ttoolSuccessBg: \"toolSuccessBg\",\n\t\ttoolErrorBg: \"toolErrorBg\",\n\t\ttoolTitle: \"\",\n\t\ttoolOutput: \"mediumGray\",\n\n\t\tmdHeading: \"yellow\",\n\t\tmdLink: \"blue\",\n\t\tmdLinkUrl: \"dimGray\",\n\t\tmdCode: \"teal\",\n\t\tmdCodeBlock: \"green\",\n\t\tmdCodeBlockBorder: \"mediumGray\",\n\t\tmdQuote: \"mediumGray\",\n\t\tmdQuoteBorder: \"mediumGray\",\n\t\tmdHr: \"mediumGray\",\n\t\tmdListBullet: \"green\",\n\n\t\ttoolDiffAdded: \"green\",\n\t\ttoolDiffRemoved: \"red\",\n\t\ttoolDiffContext: \"mediumGray\",\n\n\t\tsyntaxComment: \"#008000\",\n\t\tsyntaxKeyword: \"#0000FF\",\n\t\tsyntaxFunction: \"#795E26\",\n\t\tsyntaxVariable: \"#001080\",\n\t\tsyntaxString: \"#A31515\",\n\t\tsyntaxNumber: \"#098658\",\n\t\tsyntaxType: \"#267F99\",\n\t\tsyntaxOperator: \"#000000\",\n\t\tsyntaxPunctuation: \"#000000\",\n\n\t\tthinkingOff: \"blueMuted\",\n\t\tthinkingMinimal: \"blueLow\",\n\t\tthinkingLow: \"blueMedium\",\n\t\tthinkingMedium: \"teal\",\n\t\tthinkingHigh: \"blueHigh\",\n\t\tthinkingXhigh: \"blueXhigh\",\n\n\t\tbashMode: \"green\",\n\t},\n\texport: {\n\t\tpageBg: \"#f8f8f8\",\n\t\tcardBg: \"#ffffff\",\n\t\tinfoBg: \"#fffae6\",\n\t},\n};\n\n// ---------------------------------------------------------------------------\n// Export\n// ---------------------------------------------------------------------------\n\nexport const builtinThemes: Record<string, ThemeJson> = { dark, light };\n"]}

package/packages/pi-coding-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gsd/pi-coding-agent",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Coding agent CLI (vendored from pi-mono)",
   "type": "module",
   "piConfig": {

package/packages/pi-coding-agent/src/cli/args.ts

@@ -49,7 +49,7 @@ export interface Args {
 	fileArgs: string[];
 	/** Unknown flags (potentially extension flags) - map of flag name to value */
 	unknownFlags: Map<string, boolean | string>;
-	/** --bare: suppress CLAUDE.md/AGENTS.md, user skills, prompt templates, themes, project preferences */
+	/** --bare: suppress lsd.md/CLAUDE.md/AGENTS.md, user skills, prompt templates, themes, project preferences */
 	bare?: boolean;
 }
 

package/packages/pi-coding-agent/src/core/agent-session.ts

@@ -362,6 +362,13 @@ export class AgentSession {
 		});
 	}
 
+	private async _waitForAutomatedFollowUps(): Promise<void> {
+		while (this._retryHandler.isRetrying || this._compactionOrchestrator.hasPendingAutoCompaction) {
+			await this._retryHandler.waitForRetry();
+			await this._compactionOrchestrator.waitForAutoCompaction();
+		}
+	}
+
 	/** Model registry for API key resolution and model discovery */
 	get modelRegistry(): ModelRegistry {
 		return this._modelRegistry;
@@ -398,6 +405,7 @@ export class AgentSession {
 		// _processAgentEvent, slow earlier queued events can delay agent_end processing
 		// and waitForRetry() can miss the in-flight retry.
 		this._createRetryPromiseForAgentEnd(event);
+		this._createAutoCompactionPromiseForAgentEnd(event);
 
 		this._agentEventQueue = this._agentEventQueue.then(
 			() => this._processAgentEvent(event),
@@ -413,6 +421,11 @@ export class AgentSession {
 		this._retryHandler.createRetryPromiseForAgentEnd(event.messages);
 	}
 
+	private _createAutoCompactionPromiseForAgentEnd(event: AgentEvent): void {
+		if (event.type !== "agent_end") return;
+		this._compactionOrchestrator.createAutoCompactionPromiseForAgentEnd(event.messages);
+	}
+
 	private async _processAgentEvent(event: AgentEvent): Promise<void> {
 		// When a user message starts, check if it's from either queue and remove it BEFORE emitting
 		// This ensures the UI sees the updated queue state
@@ -1191,7 +1204,7 @@ export class AgentSession {
 		}
 
 		await this.agent.prompt(messages);
-		await this._retryHandler.waitForRetry();
+		await this._waitForAutomatedFollowUps();
 	}
 
 	/**

package/packages/pi-coding-agent/src/core/auth-storage.test.ts

@@ -1,5 +1,8 @@
 import { describe, it } from "node:test";
 import assert from "node:assert/strict";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { AuthStorage } from "./auth-storage.js";
 
 // ─── helpers ──────────────────────────────────────────────────────────────────
@@ -356,6 +359,33 @@ describe("AuthStorage — oauth credential for non-OAuth provider (#2083)", () =
 	});
 });
 
+describe("AuthStorage — ~/.codex fallback for openai-codex", () => {
+	it("hasAuth returns true when ~/.codex/auth.json contains an access token", async (t) => {
+		const tempHome = join(tmpdir(), `auth-storage-codex-${Date.now()}`);
+		mkdirSync(join(tempHome, ".codex"), { recursive: true });
+		writeFileSync(
+			join(tempHome, ".codex", "auth.json"),
+			JSON.stringify({ tokens: { access_token: "codex-access-token" } }, null, 2),
+			"utf8",
+		);
+
+		const originalHome = process.env.HOME;
+		process.env.HOME = tempHome;
+		t.after(() => {
+			if (originalHome === undefined) {
+				delete process.env.HOME;
+			} else {
+				process.env.HOME = originalHome;
+			}
+		});
+
+		const storage = inMemory({});
+		assert.equal(storage.hasAuth("openai-codex"), true);
+		const key = await storage.getApiKey("openai-codex");
+		assert.equal(key, "codex-access-token");
+	});
+});
+
 // ─── getAll truncation ────────────────────────────────────────────────────────
 
 describe("AuthStorage — getAll()", () => {

package/packages/pi-coding-agent/src/core/auth-storage.ts

@@ -17,6 +17,7 @@ import {
 } from "@gsd/pi-ai";
 import { getOAuthApiKey, getOAuthProvider, getOAuthProviders } from "@gsd/pi-ai/oauth";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
 import { dirname, join } from "path";
 import { getAgentDir } from "../config.js";
 import { AUTH_LOCK_STALE_MS } from "./constants.js";
@@ -419,6 +420,21 @@ export class AuthStorage {
 		if (this.data[provider]) return true;
 		if (getEnvApiKey(provider)) return true;
 		if (this.fallbackResolver?.(provider)) return true;
+		// Mirror getApiKey()'s ~/.codex/auth.json fallback for openai-codex
+		if (provider === 'openai-codex') {
+			try {
+				const codexAuthPath = join(homedir(), '.codex', 'auth.json');
+				if (existsSync(codexAuthPath)) {
+					const raw = readFileSync(codexAuthPath, 'utf-8');
+					const data = JSON.parse(raw) as {
+						tokens?: { access_token?: string };
+					};
+					if (data.tokens?.access_token) return true;
+				}
+			} catch {
+				// Silently ignore
+			}
+		}
 		return false;
 	}
 
@@ -782,6 +798,26 @@ export class AuthStorage {
 		const envKey = getEnvApiKey(providerId);
 		if (envKey) return envKey;
 
+		// External CLI auth fallback: openai-codex can use ~/.codex/auth.json credentials
+		if (providerId === 'openai-codex') {
+			try {
+				const { existsSync: fsExists, readFileSync: fsRead } = await import('fs');
+				const { join: pathJoin } = await import('path');
+				const { homedir } = await import('os');
+				const codexAuthPath = pathJoin(homedir(), '.codex', 'auth.json');
+				if (fsExists(codexAuthPath)) {
+					const raw = fsRead(codexAuthPath, 'utf-8');
+					const data = JSON.parse(raw) as {
+						tokens?: { access_token?: string; refresh_token?: string; account_id?: string };
+					};
+					const token = data.tokens?.access_token;
+					if (token) return token;
+				}
+			} catch {
+				// Silently ignore — file may not exist or be malformed
+			}
+		}
+
 		// Fall back to custom resolver (e.g., models.json custom providers)
 		return this.fallbackResolver?.(providerId) ?? undefined;
 	}

package/packages/pi-coding-agent/src/core/compaction/compaction.ts

@@ -85,12 +85,14 @@ export interface CompactionSettings {
 	enabled: boolean;
 	reserveTokens: number;
 	keepRecentTokens: number;
+	thresholdPercent: number;
 }
 
 export const DEFAULT_COMPACTION_SETTINGS: CompactionSettings = {
 	enabled: true,
 	reserveTokens: COMPACTION_RESERVE_TOKENS,
 	keepRecentTokens: COMPACTION_KEEP_RECENT_TOKENS,
+	thresholdPercent: 85,
 };
 
 // ============================================================================
@@ -184,9 +186,16 @@ export function estimateContextTokens(messages: AgentMessage[]): ContextUsageEst
 
 /**
  * Check if compaction should trigger based on context usage.
+ * Uses thresholdPercent (e.g. 85 = trigger at 85% of context window) when contextWindow > 0.
+ * Falls back to reserveTokens for overflow/unknown-window cases.
  */
 export function shouldCompact(contextTokens: number, contextWindow: number, settings: CompactionSettings): boolean {
 	if (!settings.enabled) return false;
+	if (contextWindow > 0) {
+		const threshold = Math.floor(contextWindow * (settings.thresholdPercent / 100));
+		return contextTokens >= threshold;
+	}
+	// No context window info — fall back to reserve-token guard
 	return contextTokens > contextWindow - settings.reserveTokens;
 }
 

package/packages/pi-coding-agent/src/core/compaction-orchestrator.test.ts

@@ -0,0 +1,87 @@
+import assert from "node:assert/strict";
+import { describe, it, mock } from "node:test";
+
+import { CompactionOrchestrator, type CompactionOrchestratorDeps } from "./compaction-orchestrator.js";
+import { AgentSession } from "./agent-session.js";
+
+function createDeps(): CompactionOrchestratorDeps {
+	return {
+		agent: {
+			state: { messages: [] },
+			hasQueuedMessages: () => false,
+			replaceMessages: () => {},
+			continue: async () => {},
+		} as any,
+		sessionManager: {} as any,
+		settingsManager: {
+			getCompactionEnabled: () => true,
+			getCompactionSettings: () => ({ enabled: true, reserveTokens: 1000, keepRecentTokens: 1000, thresholdPercent: 85 }),
+		} as any,
+		modelRegistry: {} as any,
+		getModel: () => undefined,
+		getSessionId: () => "test-session",
+		getExtensionRunner: () => undefined,
+		emit: () => {},
+		disconnectFromAgent: () => {},
+		reconnectToAgent: () => {},
+		abort: async () => {},
+	};
+}
+
+describe("CompactionOrchestrator auto-compaction continuation", () => {
+	it("keeps waitForAutoCompaction pending until scheduled auto-continue settles", async () => {
+		const orchestrator = new CompactionOrchestrator(createDeps());
+		orchestrator.createAutoCompactionPromiseForAgentEnd([{ role: "assistant" } as any]);
+
+		let resolved = false;
+		const waitPromise = orchestrator.waitForAutoCompaction().then(() => {
+			resolved = true;
+		});
+
+		(orchestrator as any)._pendingAutoContinues = 1;
+		(orchestrator as any)._resolveAutoCompaction();
+		await new Promise((resolve) => setTimeout(resolve, 0));
+		assert.equal(resolved, false, "auto-compaction wait resolved before pending continue finished");
+
+		(orchestrator as any)._pendingAutoContinues = 0;
+		(orchestrator as any)._resolveAutoCompaction();
+		await waitPromise;
+		assert.equal(resolved, true);
+	});
+
+	it("AgentSession waits for auto-compaction follow-ups before finishing a prompt", async () => {
+		let releaseCompaction!: () => void;
+		const compactionDone = new Promise<void>((resolve) => {
+			releaseCompaction = resolve;
+		});
+
+		const fakeSession = {
+			_retryHandler: {
+				isRetrying: false,
+				waitForRetry: mock.fn(async () => {}),
+			},
+			_compactionOrchestrator: {
+				hasPendingAutoCompaction: true,
+				waitForAutoCompaction: mock.fn(async () => {
+					await compactionDone;
+					(fakeSession._compactionOrchestrator as any).hasPendingAutoCompaction = false;
+				}),
+			},
+		};
+
+		let resolved = false;
+		const waitPromise = (AgentSession.prototype as any)._waitForAutomatedFollowUps.call(fakeSession).then(() => {
+			resolved = true;
+		});
+
+		await new Promise((resolve) => setTimeout(resolve, 0));
+		assert.equal(resolved, false, "session finished before auto-compaction follow-up completed");
+
+		releaseCompaction();
+		await waitPromise;
+
+		assert.equal(resolved, true);
+		assert.equal(fakeSession._retryHandler.waitForRetry.mock.calls.length, 1);
+		assert.equal(fakeSession._compactionOrchestrator.waitForAutoCompaction.mock.calls.length, 1);
+	});
+});

package/packages/pi-coding-agent/src/core/compaction-orchestrator.ts

@@ -48,6 +48,9 @@ export class CompactionOrchestrator {
 	private _autoCompactionAbortController: AbortController | undefined = undefined;
 	private _overflowRecoveryAttempted = false;
 	private _branchSummaryAbortController: AbortController | undefined = undefined;
+	private _autoCompactionPromise: Promise<void> | undefined = undefined;
+	private _autoCompactionResolve: (() => void) | undefined = undefined;
+	private _pendingAutoContinues = 0;
 
 	constructor(private readonly _deps: CompactionOrchestratorDeps) {}
 
@@ -60,6 +63,40 @@ export class CompactionOrchestrator {
 		);
 	}
 
+	/** Whether an auto-compaction follow-up (including resume/continue) is in progress */
+	get hasPendingAutoCompaction(): boolean {
+		return this._autoCompactionPromise !== undefined;
+	}
+
+	/** Create an auto-compaction wait promise synchronously for agent_end events. */
+	createAutoCompactionPromiseForAgentEnd(messages: Array<{ role: string } & Record<string, any>>): void {
+		if (this._autoCompactionPromise) return;
+		if (!this._deps.settingsManager.getCompactionEnabled()) return;
+		const hasAssistant = messages.some((message) => message.role === "assistant");
+		if (!hasAssistant) return;
+		this._autoCompactionPromise = new Promise((resolve) => {
+			this._autoCompactionResolve = resolve;
+		});
+	}
+
+	/** Wait for any in-progress auto-compaction follow-up to settle. */
+	async waitForAutoCompaction(): Promise<void> {
+		if (this._autoCompactionPromise) {
+			await this._autoCompactionPromise;
+		}
+	}
+
+	private _resolveAutoCompaction(): void {
+		if (this._pendingAutoContinues > 0 || this._autoCompactionAbortController !== undefined) {
+			return;
+		}
+		if (this._autoCompactionResolve) {
+			this._autoCompactionResolve();
+			this._autoCompactionResolve = undefined;
+			this._autoCompactionPromise = undefined;
+		}
+	}
+
 	/** Reset overflow recovery flag (called when a new user message starts) */
 	resetOverflowRecovery(): void {
 		this._overflowRecoveryAttempted = false;
@@ -211,9 +248,15 @@ export class CompactionOrchestrator {
 	 */
 	async checkCompaction(assistantMessage: AssistantMessage, skipAbortedCheck = true): Promise<void> {
 		const settings = this._deps.settingsManager.getCompactionSettings();
-		if (!settings.enabled) return;
+		if (!settings.enabled) {
+			this._resolveAutoCompaction();
+			return;
+		}
 
-		if (skipAbortedCheck && assistantMessage.stopReason === "aborted") return;
+		if (skipAbortedCheck && assistantMessage.stopReason === "aborted") {
+			this._resolveAutoCompaction();
+			return;
+		}
 
 		const model = this._deps.getModel();
 		const contextWindow = model?.contextWindow ?? 0;
@@ -225,7 +268,10 @@ export class CompactionOrchestrator {
 		const compactionEntry = getLatestCompactionEntry(branchEntries);
 		const assistantIsFromBeforeCompaction =
 			compactionEntry !== null && assistantMessage.timestamp <= new Date(compactionEntry.timestamp).getTime();
-		if (assistantIsFromBeforeCompaction) return;
+		if (assistantIsFromBeforeCompaction) {
+			this._resolveAutoCompaction();
+			return;
+		}
 
 		// Case 1: Overflow - LLM returned context overflow error
 		if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
@@ -238,6 +284,7 @@ export class CompactionOrchestrator {
 					errorMessage:
 						"Context overflow recovery failed after one compact-and-retry attempt. Try reducing context or switching to a larger-context model.",
 				});
+				this._resolveAutoCompaction();
 				return;
 			}
 
@@ -255,13 +302,17 @@ export class CompactionOrchestrator {
 		if (assistantMessage.stopReason === "error") {
 			const messages = this._deps.agent.state.messages;
 			const estimate = estimateContextTokens(messages);
-			if (estimate.lastUsageIndex === null) return;
+			if (estimate.lastUsageIndex === null) {
+				this._resolveAutoCompaction();
+				return;
+			}
 			const usageMsg = messages[estimate.lastUsageIndex];
 			if (
 				compactionEntry &&
 				usageMsg.role === "assistant" &&
 				(usageMsg as AssistantMessage).timestamp <= new Date(compactionEntry.timestamp).getTime()
 			) {
+				this._resolveAutoCompaction();
 				return;
 			}
 			contextTokens = estimate.tokens;
@@ -270,7 +321,10 @@ export class CompactionOrchestrator {
 		}
 		if (shouldCompact(contextTokens, contextWindow, settings)) {
 			await this._runAutoCompaction("threshold", false);
+			return;
 		}
+
+		this._resolveAutoCompaction();
 	}
 
 	/** Toggle auto-compaction setting */
@@ -297,11 +351,13 @@ export class CompactionOrchestrator {
 			const model = this._deps.getModel();
 			if (!model) {
 				this._deps.emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+				this._resolveAutoCompaction();
 				return;
 			}
 
 			if (!this._deps.modelRegistry.isProviderRequestReady(model.provider)) {
 				this._deps.emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+				this._resolveAutoCompaction();
 				return;
 			}
 			// undefined for externalCli/none providers — stripped at the streamSimple boundary (model-registry.ts)
@@ -311,6 +367,7 @@ export class CompactionOrchestrator {
 			const preparation = prepareCompaction(pathEntries, settings);
 			if (!preparation) {
 				this._deps.emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
+				this._resolveAutoCompaction();
 				return;
 			}
 
@@ -334,6 +391,7 @@ export class CompactionOrchestrator {
 						aborted: true,
 						willRetry: false,
 					});
+					this._resolveAutoCompaction();
 					return;
 				}
 
@@ -369,6 +427,7 @@ export class CompactionOrchestrator {
 
 			if (this._autoCompactionAbortController.signal.aborted) {
 				this._deps.emit({ type: "auto_compaction_end", result: undefined, aborted: true, willRetry: false });
+				this._resolveAutoCompaction();
 				return;
 			}
 
@@ -392,20 +451,27 @@ export class CompactionOrchestrator {
 			const result: CompactionResult = { summary, firstKeptEntryId, tokensBefore, details };
 			this._deps.emit({ type: "auto_compaction_end", result, aborted: false, willRetry });
 
-			if (willRetry) {
-				const messages = this._deps.agent.state.messages;
-				const lastMsg = messages[messages.length - 1];
-				if (lastMsg?.role === "assistant" && (lastMsg as AssistantMessage).stopReason === "error") {
-					this._deps.agent.replaceMessages(messages.slice(0, -1));
-				}
-
+			const shouldContinue = willRetry || this._deps.agent.hasQueuedMessages();
+			if (shouldContinue) {
+				this._pendingAutoContinues++;
 				setTimeout(() => {
-					this._deps.agent.continue().catch(() => {});
-				}, 100);
-			} else if (this._deps.agent.hasQueuedMessages()) {
-				setTimeout(() => {
-					this._deps.agent.continue().catch(() => {});
+					if (willRetry) {
+						const messages = this._deps.agent.state.messages;
+						const lastMsg = messages[messages.length - 1];
+						if (lastMsg?.role === "assistant" && (lastMsg as AssistantMessage).stopReason === "error") {
+							this._deps.agent.replaceMessages(messages.slice(0, -1));
+						}
+					}
+
+					this._deps.agent.continue()
+						.catch(() => {})
+						.finally(() => {
+							this._pendingAutoContinues = Math.max(0, this._pendingAutoContinues - 1);
+							this._resolveAutoCompaction();
+						});
 				}, 100);
+			} else {
+				this._resolveAutoCompaction();
 			}
 		} catch (error) {
 			const errorMessage = getErrorMessage(error);
@@ -419,8 +485,10 @@ export class CompactionOrchestrator {
 						? `Context overflow recovery failed: ${errorMessage}`
 						: `Auto-compaction failed: ${errorMessage}`,
 			});
+			this._resolveAutoCompaction();
 		} finally {
 			this._autoCompactionAbortController = undefined;
+			this._resolveAutoCompaction();
 		}
 	}
 }

package/packages/pi-coding-agent/src/core/keybindings.ts

@@ -56,7 +56,7 @@ const DEFAULT_APP_KEYBINDINGS: Record<AppAction, KeyId | KeyId[]> = {
 	clear: "ctrl+c",
 	exit: "ctrl+d",
 	suspend: "ctrl+z",
-	cycleThinkingLevel: "shift+tab",
+	cycleThinkingLevel: "alt+j",
 	cycleModelForward: "ctrl+p",
 	cycleModelBackward: "shift+ctrl+p",
 	selectModel: "ctrl+l",
@@ -71,7 +71,7 @@ const DEFAULT_APP_KEYBINDINGS: Record<AppAction, KeyId | KeyId[]> = {
 	tree: [],
 	fork: [],
 	resume: [],
-	cyclePermissionMode: "alt+j",
+	cyclePermissionMode: "shift+tab",
 };
 
 /**