pi-cc-loop 0.7.3 → 0.7.4

package/README.md

@@ -96,12 +96,13 @@ Ctrl+O 展开后多一行元信息（任务 id、节奏）。`compactMessages`
   "footer": true,            // 底部摘要：loop 的一行和 Monitor 的 `monitor N`
   "draft": true,             // pi-cc-plugins：Ctrl+C 找回
   "turnSummary": true,       // pi-cc-plugins：回合摘要一行
+  "ccKeys": true,            // pi-cc-plugins：Enter 排队、Ctrl+Enter 直发
   "compaction": true,        // pi-cc-compaction：Claude Code 的压缩
   "idleCompaction": true     // pi-cc-compaction：空闲压缩
 }
 ```
 
-draft、turnSummary 只被 pi-cc-plugins 读取，compaction、idleCompaction 只被 pi-cc-compaction 读取；没装对应包的会话里，面板中的这些项不生效，值原样保留。
+draft、turnSummary、ccKeys 只被 pi-cc-plugins 读取，compaction、idleCompaction 只被 pi-cc-compaction 读取；没装对应包的会话里，面板中的这些项不生效，值原样保留。
 
 在 TUI 里输入 `/pi_cc` 会打开设置面板，和 pi-cc-extensions 的 `/ccstyle` 一样按页组织，每个插件一页：
 **Loop & Monitor**（消息样式、底部摘要，两个包共用）、**Plugins**（pi-cc-plugins）、**Compact**（pi-cc-compaction）。
@@ -128,7 +129,7 @@ Loop & Monitor / Plugins / Compact             ~/.pi/agent/pi-cc.json
 也可以用文字命令：`/pi_cc messages on|off`、`/pi_cc footer on|off`，适合脚本和 RPC；
 非 TUI 模式下，不带参数的 `/pi_cc` 按页输出当前设置。命令只写改动的那一项，文件里的其他内容原样保留。
 
-环境变量 `PI_CC_FOOTER`、`PI_CC_COMPACT_MESSAGES`（pi-cc-plugins 的两项是 `PI_CC_DRAFT`、`PI_CC_TURN_SUMMARY`，pi-cc-compaction 的两项是 `PI_CC_COMPACTION`、`PI_CC_IDLE_COMPACTION`）优先于文件，但不会被写进文件。设着的时候，面板里这一项显示实际生效的值、不能切换，
+环境变量 `PI_CC_FOOTER`、`PI_CC_COMPACT_MESSAGES`（pi-cc-plugins 的三项是 `PI_CC_DRAFT`、`PI_CC_TURN_SUMMARY`、`PI_CC_KEYS`，pi-cc-compaction 的两项是 `PI_CC_COMPACTION`、`PI_CC_IDLE_COMPACTION`）优先于文件，但不会被写进文件。设着的时候，面板里这一项显示实际生效的值、不能切换，
 说明里写出是哪个变量；文字输出会在对应项后面标出来（如 `hidden (PI_CC_FOOTER=0)`）；用文字命令切换会写进文件，但提示会说明变量还在覆盖它。
 
 ## 底部摘要

package/config.ts

@@ -13,12 +13,13 @@
  *     "footer": true,
  *     "draft": true,
  *     "turnSummary": true,
+ *     "ccKeys": true,
  *     "compaction": true,
  *     "idleCompaction": true
  *   }
  *
- * compactMessages and footer drive loop and monitor; draft and turnSummary
- * drive pi-cc-plugins; compaction and idleCompaction drive pi-cc-compaction. A package that is not installed simply ignores its
+ * compactMessages and footer drive loop and monitor; draft, turnSummary and
+ * ccKeys drive pi-cc-plugins; compaction and idleCompaction drive pi-cc-compaction. A package that is not installed simply ignores its
  * keys, and they are kept as the user left them.
  *
  * Environment overrides (useful for tests and quick experiments) win over the
@@ -28,6 +29,7 @@
  *   PI_CC_FOOTER=0|1
  *   PI_CC_DRAFT=0|1
  *   PI_CC_TURN_SUMMARY=0|1
+ *   PI_CC_KEYS=0|1
  *   PI_CC_COMPACTION=0|1
  *   PI_CC_IDLE_COMPACTION=0|1
  */
@@ -48,6 +50,8 @@ export interface PiCcConfig {
 	draft: boolean;
 	/** pi-cc-plugins: one line closes every agent run. */
 	turnSummary: boolean;
+	/** pi-cc-plugins: Claude Code's Enter queues, Ctrl+Enter sends now. */
+	ccKeys: boolean;
 	/** pi-cc-compaction: Claude Code's compaction replaces Pi's summary request. */
 	compaction: boolean;
 	/** pi-cc-compaction: compact while idle, before a long prompt cache expires. */
@@ -59,6 +63,7 @@ export const DEFAULT_CONFIG: PiCcConfig = {
 	footer: true,
 	draft: true,
 	turnSummary: true,
+	ccKeys: true,
 	compaction: true,
 	idleCompaction: true,
 };
@@ -69,6 +74,7 @@ const ENV_OVERRIDES: Record<keyof PiCcConfig, string> = {
 	footer: "PI_CC_FOOTER",
 	draft: "PI_CC_DRAFT",
 	turnSummary: "PI_CC_TURN_SUMMARY",
+	ccKeys: "PI_CC_KEYS",
 	compaction: "PI_CC_COMPACTION",
 	idleCompaction: "PI_CC_IDLE_COMPACTION",
 };
@@ -93,6 +99,11 @@ export function configPath(): string {
 	return path.join(getAgentDir(), "pi-cc.json");
 }
 
+/** One setting: an environment override, else the file's boolean, else the default. */
+function readSetting(file: Partial<PiCcConfig>, key: keyof PiCcConfig): boolean {
+	return envBool(ENV_OVERRIDES[key]) ?? (typeof file[key] === "boolean" ? (file[key] as boolean) : DEFAULT_CONFIG[key]);
+}
+
 function readConfig(): PiCcConfig {
 	let file: Partial<PiCcConfig> = {};
 	try {
@@ -101,23 +112,11 @@ function readConfig(): PiCcConfig {
 	} catch {
 		// Missing or malformed files fall back to defaults.
 	}
-	return {
-		compactMessages:
-			envBool(ENV_OVERRIDES.compactMessages) ??
-			(typeof file.compactMessages === "boolean" ? file.compactMessages : DEFAULT_CONFIG.compactMessages),
-		footer:
-			envBool(ENV_OVERRIDES.footer) ?? (typeof file.footer === "boolean" ? file.footer : DEFAULT_CONFIG.footer),
-		draft: envBool(ENV_OVERRIDES.draft) ?? (typeof file.draft === "boolean" ? file.draft : DEFAULT_CONFIG.draft),
-		turnSummary:
-			envBool(ENV_OVERRIDES.turnSummary) ??
-			(typeof file.turnSummary === "boolean" ? file.turnSummary : DEFAULT_CONFIG.turnSummary),
-		compaction:
-			envBool(ENV_OVERRIDES.compaction) ??
-			(typeof file.compaction === "boolean" ? file.compaction : DEFAULT_CONFIG.compaction),
-		idleCompaction:
-			envBool(ENV_OVERRIDES.idleCompaction) ??
-			(typeof file.idleCompaction === "boolean" ? file.idleCompaction : DEFAULT_CONFIG.idleCompaction),
-	};
+	// One loop over the defaults, so a setting added to DEFAULT_CONFIG is read
+	// without a second edit here.
+	const config = { ...DEFAULT_CONFIG };
+	for (const key of Object.keys(config) as Array<keyof PiCcConfig>) config[key] = readSetting(file, key);
+	return config;
 }
 
 let cached: PiCcConfig | undefined;

package/cron.ts

@@ -158,27 +158,6 @@ export function isUnreachable(expression: string): boolean {
 	return nextFireAfter(fields, new Date(), 366) === null;
 }
 
-/**
- * The divisor of `total` closest to `n`.
- *
- * Claude Code rounds a non-dividing interval to the nearest clean one: "If the
- * interval doesn't cleanly divide its unit, round to the nearest clean interval
- * and tell the user what you rounded to."
- */
-function nearestDivisor(n: number, total: number): number {
-	let best = 1;
-	let bestDistance = Number.POSITIVE_INFINITY;
-	for (let d = 1; d <= total; d++) {
-		if (total % d !== 0) continue;
-		const distance = Math.abs(d - n);
-		if (distance < bestDistance) {
-			best = d;
-			bestDistance = distance;
-		}
-	}
-	return best;
-}
-
 const DAY_NAMES = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 
 

package/index.ts

@@ -36,7 +36,7 @@ import {
 	parseCron,
 } from "./cron.ts";
 import { DurableRuntime, type Placement } from "./durable.ts";
-import { displayPrompt, isLoopFileSentinel, LoopFileDelivery, type TickMode } from "./loopfile.ts";
+import { displayPrompt, isLoopFileSentinel, LoopFileDelivery } from "./loopfile.ts";
 import {
 	CRON_CREATE_DESCRIPTION,
 	CRON_CREATE_SNIPPET,
@@ -453,8 +453,8 @@ export default function piCcLoopExtension(pi: ExtensionAPI): void {
 	}
 
 	/** The text the model gets for a prompt: the loop.md sentinel expands at fire time. */
-	function resolvePrompt(prompt: string, mode: TickMode): string {
-		return isLoopFileSentinel(prompt) ? loopFile.resolve(lastCtx?.cwd ?? process.cwd(), mode) : prompt;
+	function resolvePrompt(prompt: string): string {
+		return isLoopFileSentinel(prompt) ? loopFile.resolve(lastCtx?.cwd ?? process.cwd()) : prompt;
 	}
 
 	/**
@@ -464,7 +464,7 @@ export default function piCcLoopExtension(pi: ExtensionAPI): void {
 	 */
 	function deliverTick(job: LoopJob): void {
 		const tick = Math.max(tickCounters.get(job.prompt) ?? 0, job.tickCount ?? 0) + 1;
-		const body = resolvePrompt(job.prompt, job.kind === "cron" ? "cron" : "wakeup");
+		const body = resolvePrompt(job.prompt);
 		// A fixed-interval tick is what it is - a scheduled task - and a
 		// self-paced tick keeps the loop framing. The rules for the run are
 		// rebuilt from `details` in before_agent_start.
@@ -574,7 +574,7 @@ export default function piCcLoopExtension(pi: ExtensionAPI): void {
 		handler: async (args: string, ctx: ExtensionCommandContext) => {
 			lastCtx = ctx;
 			const raw = args.trim();
-			const [head, ...rest] = raw.split(/\s+/);
+			const [head] = raw.split(/\s+/);
 
 			// Settings moved to /pi_cc: these words stay recognized so they cannot
 			// start a loop by mistake (everything else is a loop request).
@@ -1101,8 +1101,10 @@ export default function piCcLoopExtension(pi: ExtensionAPI): void {
 
 		if (event.message.customType === MONITOR_EVENT_TYPE) {
 			// A monitor bound to a loop woke the agent: the run belongs to that loop.
+			// The monitor stores the prompt the model gave it; the chain is keyed
+			// without a leading `/loop`, so both spellings find it.
 			const loopPrompt = (event.message.details as { loopPrompt?: unknown } | undefined)?.loopPrompt;
-			const chain = typeof loopPrompt === "string" ? scheduler.findChain(loopPrompt) : undefined;
+			const chain = typeof loopPrompt === "string" ? scheduler.findChain(normalizePrompt(loopPrompt)) : undefined;
 			if (chain) currentRun.chainId = chain.id;
 			return;
 		}

package/loopfile.ts

@@ -59,8 +59,6 @@ function truncate(content: string): string {
 	return `${content.slice(0, cut > 0 ? cut : LOOP_FILE_MAX_CHARS)}\n> WARNING: loop.md was truncated to ${LOOP_FILE_MAX_CHARS} bytes. Keep the task list concise.`;
 }
 
-export type TickMode = "cron" | "wakeup";
-
 /** Remembers what a session was last given, so unchanged tasks are not resent. */
 export class LoopFileDelivery {
 	private lastDelivered: string | null = null;
@@ -71,7 +69,7 @@ export class LoopFileDelivery {
 	}
 
 	/** The text of one tick for the loop.md sentinel. */
-	resolve(cwd: string, mode: TickMode): string {
+	resolve(cwd: string): string {
 		const file = readLoopFile(cwd);
 		if (file) {
 			if (this.lastDelivered === file.content) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-cc-loop",
-	"version": "0.7.3",
+	"version": "0.7.4",
 	"description": "Claude Code compatible /loop for the Pi coding agent: cron-scheduled fixed intervals, self-paced chains, and the same dispatch semantics as Claude Code.",
 	"author": "tarnish233",
 	"type": "module",

package/prompts.ts

@@ -45,19 +45,12 @@ const DELAY_ADVICE = [
 	"  fallback (1200s+) instead.",
 ].join("\n");
 
-/**
- * The rules for a `/loop <prompt>` whose interval the command layer could not
- * parse. Claude Code's /loop is a skill: the model reads the input and works
- * the schedule out itself, so an interval written in any language works.
- */
 /**
  * The instructions for one `/loop` request. Claude Code's `/loop` is a skill:
  * the command turns into a user message carrying these rules, and the model
  * drives CronCreate / CronList / CronDelete / ScheduleWakeup itself. Nothing is
  * created by code, so the conversation shows what was asked and what was done.
  */
-const LOOP_FILE_SENTINEL_PLACEHOLDER = "__loop_md_sentinel__";
-
 const LOOP_COMMAND_GUIDELINES = [
 	"This is a `/loop` request from the user: {raw}",
 	"",
@@ -91,7 +84,7 @@ const LOOP_COMMAND_GUIDELINES = [
 	"- `--max N`: pass `maxFires: N`.",
 	"",
 	"## loop.md",
-	"When the request has no task of its own (bare `/loop`, or an interval alone), pass the literal sentinel " + LOOP_FILE_SENTINEL_PLACEHOLDER + " as the prompt: it expands at fire time to `.pi/loop.md`, or to the built-in maintenance pass when there is no loop.md.",
+	"When the request has no task of its own (bare `/loop`, or an interval alone), pass the literal sentinel {sentinel} as the prompt: it expands at fire time to `.pi/loop.md`, or to the built-in maintenance pass when there is no loop.md.",
 	"For the run you do right now, read `.pi/loop.md` (or `~/.pi/loop.md`) yourself and do those tasks; the sentinel only expands on later fires.",
 ].join("\n");
 
@@ -155,12 +148,12 @@ export function scheduledTaskProvenance(id: string, schedule: string): string {
 }
 
 export function loopCommandGuidelines(raw: string): string {
-	const quoted = quote(raw || LOOP_FILE_SENTINEL);
 	return fill(LOOP_COMMAND_GUIDELINES, {
 		raw: raw ? `${quote(raw)}` : "(empty: the loop.md tasks)",
-		quoted,
+		quoted: quote(raw || LOOP_FILE_SENTINEL),
 		delayAdvice: DELAY_ADVICE,
-	}).replace(LOOP_FILE_SENTINEL_PLACEHOLDER, quote(LOOP_FILE_SENTINEL));
+		sentinel: quote(LOOP_FILE_SENTINEL),
+	});
 }
 
 export function loopGuidelines(prompt: string): string {

package/render.ts

@@ -36,11 +36,6 @@ export function contentText(content: unknown): string {
 	return "";
 }
 
-/** Remove the provenance line the model needs but the reader does not. */
-export function stripProvenance(text: string, pattern: RegExp): string {
-	return text.replace(pattern, "");
-}
-
 /** Cap a string for a display line, with an ellipsis. */
 export function truncate(text: string, max: number): string {
 	const flat = text.replace(/\s+/g, " ").trim();

package/renderers.ts

@@ -5,7 +5,7 @@
  */
 
 import type { Theme } from "@earendil-works/pi-coding-agent";
-import { bodyLines, contentText, formatStamp, renderBlock, renderCard, stripProvenance } from "./render.ts";
+import { bodyLines, contentText, formatStamp, renderBlock, renderCard } from "./render.ts";
 import { loadConfig } from "./config.ts";
 import { humanSchedule } from "./cron.ts";
 import { displayPrompt } from "./loopfile.ts";
@@ -56,7 +56,8 @@ export interface ScheduledDetails {
  */
 export function renderScheduledMessage(message: any, options: any, theme: Theme): any {
 	const details = (message.details ?? {}) as ScheduledDetails;
-	const prompt = details.prompt ?? stripProvenance(contentText(message.content), /^\[[^\]]*\]\n?/);
+	// The provenance line is addressed to the model, not the reader.
+	const prompt = details.prompt ?? contentText(message.content).replace(/^\[[^\]]*\]\n?/, "");
 	// A fixed interval fires a scheduled task; only a self-paced tick is a loop.
 	const label = details.missed
 		? "\u273b loop \u00b7 missed jobs"

package/settings.ts

@@ -100,6 +100,14 @@ const PAGES: SettingsPage[] = [
 				off: "off",
 				description: "One line closes every agent run \u2014 tools, duration, done time.",
 			},
+			{
+				field: "ccKeys",
+				label: "CC keys",
+				on: "on",
+				off: "off",
+				description:
+					"Enter queues while Pi works and Ctrl+Enter sends now, as in Claude Code. off: Pi's keys (Enter sends, Alt+Enter queues).",
+			},
 		],
 	},
 	{
@@ -262,27 +270,32 @@ function overrideNote(key: keyof PiCcConfig): string {
 	return override ? ` (${override})` : "";
 }
 
+/**
+ * The word the text summary uses for a setting: the first alias in KEYS. The
+ * panel shows the description label instead.
+ */
+function commandWord(field: keyof PiCcConfig): string {
+	return Object.keys(KEYS).find((word) => KEYS[word].field === field) ?? field;
+}
+
+/**
+ * The summary a non-TUI /pi_cc prints, generated from the same pages the panel
+ * draws: a setting added to PAGES cannot go missing here.
+ */
 function showSettings(ctx: ExtensionContext): void {
 	const config = loadConfig();
-	const lines = [
-		`pi-cc settings \u00b7 ${configPath()}`,
-		PAGES[0].label,
-		`  messages:  ${config.compactMessages ? "compact" : "card"}${overrideNote("compactMessages")}`,
-		`  footer:    ${config.footer ? "summary" : "hidden"}${overrideNote("footer")}`,
-		PAGES[1].label,
-		`  draft:     ${config.draft ? "on" : "off"}${overrideNote("draft")}`,
-		`  summary:   ${config.turnSummary ? "on" : "off"}${overrideNote("turnSummary")}`,
-		PAGES[2].label,
-		`  compact:   ${config.compaction ? "on" : "off"}${overrideNote("compaction")}`,
-		`  idle:      ${config.idleCompaction ? "on" : "off"}${overrideNote("idleCompaction")}`,
+	const lines = [`pi-cc settings \u00b7 ${configPath()}`];
+	for (const page of PAGES) {
+		lines.push(page.label);
+		for (const spec of page.settings) {
+			const value = config[spec.field] ? spec.on : spec.off;
+			lines.push(`  ${commandWord(spec.field)}:`.padEnd(13) + value + overrideNote(spec.field));
+		}
+	}
+	lines.push(
 		"",
-		"Usage: /pi_cc messages on|off",
-		"       /pi_cc footer on|off",
-		"       /pi_cc draft on|off",
-		"       /pi_cc summary on|off",
-		"       /pi_cc compact on|off",
-		"       /pi_cc idle on|off",
-	];
+		`Usage: /pi_cc <item> on|off  (${SETTINGS.map((spec) => commandWord(spec.field)).join(", ")})`,
+	);
 	notify(ctx, lines.join("\n"), "info");
 }
 
@@ -327,6 +340,8 @@ const KEYS: Record<string, { field: keyof PiCcConfig; label: string }> = {
 	draft: { field: "draft", label: "Draft recall" },
 	summary: { field: "turnSummary", label: "Turn summary" },
 	turnsummary: { field: "turnSummary", label: "Turn summary" },
+	keys: { field: "ccKeys", label: "CC keys" },
+	keymap: { field: "ccKeys", label: "CC keys" },
 	compact: { field: "compaction", label: "CC compaction" },
 	compaction: { field: "compaction", label: "CC compaction" },
 	idle: { field: "idleCompaction", label: "Idle compaction" },
@@ -381,7 +396,7 @@ export function registerPiCcCommand(pi: ExtensionAPI, owner: string): void {
 	};
 
 	pi.registerCommand("pi_cc", {
-		description: "pi-cc settings: message style, footer, draft, turn summary, compaction",
+		description: "pi-cc settings: message style, footer, draft, turn summary, CC keys, compaction",
 		handler: async (args: string, ctx: ExtensionCommandContext) => {
 			const words = args.trim().split(/\s+/).filter(Boolean);
 			// "/pi_cc settings footer on" reads like the old /loop settings: drop the noun.