@oh-my-pi/pi-coding-agent 14.9.5 → 14.9.8

package/CHANGELOG.md

@@ -2,6 +2,75 @@
 
 ## [Unreleased]
 
+## [14.9.8] - 2026-05-12
+
+### Breaking Changes
+
+- Changed the `eval` tool input format to a single-line `*** Cell <lang>:"<title>" [t:<duration>] [rst]` header per cell, replacing the `*** Begin <LANG>` / `*** End <LANG>` envelope and the standalone `*** Title:` / `*** Timeout:` / `*** Reset` directives. The lark grammar enforces a fixed attribute order; the runtime parser remains lenient (alias keys, bare positional tokens, single-quoted titles).
+
+### Added
+
+- Added `:conflicts` read selector (`read <path>:conflicts`) to return a one-line index of all unresolved merge conflicts with stable `#N` IDs for quick inspection
+- Added bulk conflict resolution with `write({ path: "conflict://*", content })` to resolve all currently registered conflicts across files in one call, expanding `@ours`/`@theirs`/`@base`/`@both` per conflict and returning per-file counts
+- Added `read` support for `conflict://<N>` and `read conflict://<N>/<scope>` to inspect unresolved conflict regions captured by a prior read, including `ours`, `theirs`, and `base` side views with original file line alignment
+- Added shorthand content tokens `@ours`, `@theirs`, `@both`, and `@base` to conflict-resolution writes using `path: "conflict://<N>"` so replacement content can be composed from recorded conflict sections
+- Added conflict count metadata to read results so conflict files now show a warning badge (`⚠ N`) in the read tool UI
+- Added support for explicit boolean `rst` values (`rst:true`, `rst:false`, `rst:1`, `rst:0`, `rst:yes`, `rst:no`, `rst:on`, `rst:off`) in `*** Cell` headers
+- Added detection of unresolved git merge conflicts in `read` output: each marker block is registered with a session-stable id and surfaced in a footer with `ours`/`theirs` previews. Resolve a block by calling `write({ path: "conflict://<id>", content })` — the tool splices the recorded marker region (markers and all sides) with the supplied content and routes through the normal writethrough (LSP format/diagnostics, fs-cache invalidation).
+
+### Changed
+
+- Changed `read` conflict warning footers to show `X of Y` unresolved conflicts when a range only captures part of a file and provide a `read <path>:conflicts` hint for the full list
+- Changed conflict scanning in conflict read paths to inspect the whole file (with a 10 MB cap) so totals better reflect hidden conflicts and truncated scans are called out
+- Changed conflict marker scanning during `read` to only register fully formed, column-0 merge-marker blocks, so indented or malformed marker-like lines are no longer treated as conflicts
+- Changed `write` conflict resolution to validate `conflict://` IDs and report clear errors for malformed or unknown conflict URIs
+- Changed the HTML transcript renderer to parse the new `*** Cell` headers while keeping the older `*** Begin <LANG>` and `===== ... =====` formats renderable for historical sessions.
+- Changed the `eval` tool parser so a stray non-marker line between cells no longer crashes with `null is not an object (evaluating 'BEGIN_RE.exec(lines[i])[1]')`; stray content is consumed without aborting parsing.
+- Changed `*** End` to be an optional, undocumented per-cell terminator (kept in the lark to satisfy GPT-trained models' natural terminator habit during constrained sampling).
+
+### Fixed
+
+- Fixed single-conflict `write` retries to re-locate the recorded conflict block by exact marker content so shifted line numbers from out-of-band edits no longer prevent resolution
+- Fixed `read conflict://*` handling by rejecting wildcard reads with a clear write-only guidance error
+- Fixed conflict resolution to verify the live file still contains recorded `<<<<<<<` and `>>>>>>>` markers before splicing, preventing stale conflict IDs from silently corrupting out-of-band-edited files
+- Fixed `@base` token handling so two-way conflicts without a base section now return a clear error
+- Improved `*** Cell` header parsing to reject invalid `rst` values with a clear `invalid rst value` error
+
+## [14.9.7] - 2026-05-12
+
+### Breaking Changes
+
+- Changed the `timeoutMs` execution option to no longer be enforced during worker-based JS runs, so callers must rely on external cancellation signals for time limits
+- Replaced the Jupyter kernel gateway + WebSocket protocol behind the Python `eval` backend with a subprocess-backed runner that speaks NDJSON over stdin/stdout; removed the `jupyter_kernel_gateway`/`ipykernel` pip dependencies, the `python.sharedGateway` setting, the `omp jupyter` CLI command, and the `PI_PYTHON_GATEWAY_URL` / `PI_PYTHON_GATEWAY_TOKEN` environment variables
+
+### Added
+
+- Added Python `tool.<name>(args)` support to `executePython` sessions so evaluated Python code can invoke session tools through the prelude `tool` proxy
+- Added per-execution Python tool bridge session registration and loopback endpoint wiring so Python tool calls resolve to host tools and return tool results
+- Added status-event forwarding for Python tool bridge calls so `tool` invocations can emit execution status updates
+- Added browser-tab JavaScript execution through the shared runtime so tab runs now expose the standard helper globals (`read`, `write`, `sort`, `uniq`, `counter`, `diff`, `tree`, `env`, `output`, `display`, and `tool`)
+- Added static ESM `import` support to browser-tab JavaScript by rewriting top-level imports and resolving them against the tab session context
+- Added substring fallback matching to `HistoryStorage.search` so infix and short-token queries that FTS5 prefix matching misses are still returned
+- Added a live single-line sync progress display to the stats command showing current/total sessions while syncing
+- Added automatic inline JS evaluation fallback when worker creation failed so script execution still works in environments without worker support
+
+### Changed
+
+- Changed `setup python` to only verify a reachable Python 3 interpreter instead of installing Jupyter dependencies
+- Changed `info` output to remove the obsolete Python Gateway status block now that shared gateway management is no longer available
+- Changed JavaScript execution in `executeJs` to expose the worker\u2019s real `process` object instead of a restricted, frozen subset
+- Changed JavaScript evaluation to run per session in a worker-backed runner with explicit initialization and teardown handling
+- Changed the Python backend to launch one `python -u runner.py` subprocess per kernel; cancellation now sends `SIGINT` which raises a real `KeyboardInterrupt` in user code, and the same subprocess is reused across cells in session mode
+- Changed Python magic handling so `%pip`, `%cd`, `%env`, `%pwd`, `%ls`, `%time`, `%timeit`, `%who`, `%reset`, `%load`, `%run`, `%%bash`, `%%capture`, `%%timeit`, `%%writefile`, and `!shell` work without depending on IPython
+
+### Fixed
+
+- Fixed Python output rendering so `text/markdown` takes precedence over `text/plain` and status bundles are emitted as status updates rather than plain text
+- Fixed query tokenization in `HistoryStorage.search` so punctuation-delimited terms like `git-commit` are aligned with indexing and matched correctly
+- Fixed history search result merging to de-duplicate matches and return full-text matches before substring-only matches while still respecting the requested limit
+- Fixed JS run cancellation so aborting a run now also cancels in-flight tool calls and terminates the active worker session
+- Fixed top-level `const`, `let`, and `class` declarations in evaluated JavaScript to persist across subsequent runs by rewriting top-level declarations
+
 ## [14.9.5] - 2026-05-12
 ### Breaking Changes
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "14.9.5",
+	"version": "14.9.8",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "14.9.5",
-		"@oh-my-pi/pi-agent-core": "14.9.5",
-		"@oh-my-pi/pi-ai": "14.9.5",
-		"@oh-my-pi/pi-natives": "14.9.5",
-		"@oh-my-pi/pi-tui": "14.9.5",
-		"@oh-my-pi/pi-utils": "14.9.5",
+		"@oh-my-pi/omp-stats": "14.9.8",
+		"@oh-my-pi/pi-agent-core": "14.9.8",
+		"@oh-my-pi/pi-ai": "14.9.8",
+		"@oh-my-pi/pi-natives": "14.9.8",
+		"@oh-my-pi/pi-tui": "14.9.8",
+		"@oh-my-pi/pi-utils": "14.9.8",
 		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@types/turndown": "5.0.6",

package/scripts/generate-template.ts

@@ -18,10 +18,11 @@ const minifiedCss = css
 	.replace(/\s*([{}:;,])\s*/g, "$1")
 	.trim();
 
-// Inline everything
+// Inline everything; use function replacements so `$'`, `$&`, `$$`, etc. inside
+// the embedded CSS/JS are not interpreted as substitution patterns.
 const template = html
-	.replace("<template-css/>", `<style>${minifiedCss}</style>`)
-	.replace("<template-js/>", `<script>${js}</script>`);
+	.replace("<template-css/>", () => `<style>${minifiedCss}</style>`)
+	.replace("<template-js/>", () => `<script>${js}</script>`);
 
 // Write generated file
 const output = `// Auto-generated by scripts/generate-template.ts - DO NOT EDIT

package/src/cli/setup-cli.ts

@@ -21,7 +21,6 @@ export interface SetupCommandArgs {
 
 const VALID_COMPONENTS: SetupComponent[] = ["python", "stt"];
 
-const PYTHON_PACKAGES = ["jupyter_kernel_gateway", "ipykernel"];
 const MANAGED_PYTHON_ENV = getPythonEnvDir();
 
 /**
@@ -65,10 +64,6 @@ export function parseSetupArgs(args: string[]): SetupCommandArgs | undefined {
 interface PythonCheckResult {
 	available: boolean;
 	pythonPath?: string;
-	uvPath?: string;
-	pipPath?: string;
-	missingPackages: string[];
-	installedPackages: string[];
 	usingManagedEnv?: boolean;
 	managedEnvPath?: string;
 }
@@ -85,8 +80,6 @@ function managedPythonPath(): string {
 async function checkPythonSetup(): Promise<PythonCheckResult> {
 	const result: PythonCheckResult = {
 		available: false,
-		missingPackages: [],
-		installedPackages: [],
 		managedEnvPath: MANAGED_PYTHON_ENV,
 	};
 
@@ -94,109 +87,24 @@ async function checkPythonSetup(): Promise<PythonCheckResult> {
 	const managedPath = managedPythonPath();
 	const hasManagedEnv = await Bun.file(managedPath).exists();
 
-	result.uvPath = $which("uv") ?? undefined;
-	result.pipPath = $which("pip3") ?? $which("pip") ?? undefined;
-
-	const candidates = [systemPythonPath, hasManagedEnv ? managedPath : undefined].filter(
-		(candidate): candidate is string => !!candidate,
-	);
-	if (candidates.length === 0) {
+	const pythonPath = systemPythonPath ?? (hasManagedEnv ? managedPath : undefined);
+	if (!pythonPath) {
 		return result;
 	}
-
-	result.pythonPath = systemPythonPath ?? managedPath;
-	let bestMatch = {
-		pythonPath: candidates[0],
-		missingPackages: [...PYTHON_PACKAGES],
-		installedPackages: [] as string[],
-		usingManagedEnv: candidates[0] === managedPath,
-	};
-
-	for (const pythonPath of candidates) {
-		const installedPackages: string[] = [];
-		const missingPackages: string[] = [];
-		for (const pkg of PYTHON_PACKAGES) {
-			const moduleName = pkg === "jupyter_kernel_gateway" ? "kernel_gateway" : pkg;
-			const script = `import importlib.util; raise SystemExit(0 if importlib.util.find_spec('${moduleName}') else 1)`;
-			const check = await $`${pythonPath} -c ${script}`.quiet().nothrow();
-			if (check.exitCode === 0) {
-				installedPackages.push(pkg);
-			} else {
-				missingPackages.push(pkg);
-			}
-		}
-
-		if (missingPackages.length < bestMatch.missingPackages.length) {
-			bestMatch = {
-				pythonPath,
-				missingPackages,
-				installedPackages,
-				usingManagedEnv: pythonPath === managedPath,
-			};
-		}
-
-		if (missingPackages.length === 0) {
-			result.available = true;
-			result.pythonPath = pythonPath;
-			result.missingPackages = missingPackages;
-			result.installedPackages = installedPackages;
-			result.usingManagedEnv = pythonPath === managedPath;
-			return result;
-		}
-	}
-
-	result.pythonPath = bestMatch.pythonPath;
-	result.missingPackages = bestMatch.missingPackages;
-	result.installedPackages = bestMatch.installedPackages;
-	result.usingManagedEnv = bestMatch.usingManagedEnv;
+	const probe = await $`${pythonPath} -c "import sys;sys.exit(0)"`.quiet().nothrow();
+	result.pythonPath = pythonPath;
+	result.available = probe.exitCode === 0;
+	result.usingManagedEnv = pythonPath === managedPath;
 	return result;
 }
 
 /**
  * Install Python packages using uv (preferred) or pip.
  */
-async function installPythonPackages(
-	packages: string[],
-	pythonPath: string,
-	uvPath?: string,
-	pipPath?: string,
-): Promise<{ success: boolean; usedManagedEnv: boolean }> {
-	if (uvPath) {
-		console.log(chalk.dim(`Installing via uv: ${packages.join(" ")}`));
-		const result = await $`${uvPath} pip install ${packages}`.nothrow();
-		if (result.exitCode === 0) {
-			return { success: true, usedManagedEnv: false };
-		}
-	}
-
-	if (pipPath) {
-		console.log(chalk.dim(`Installing via pip: ${packages.join(" ")}`));
-		const result = await $`${pipPath} install ${packages}`.nothrow();
-		if (result.exitCode === 0) {
-			return { success: true, usedManagedEnv: false };
-		}
-	}
-
-	console.log(chalk.dim(`Falling back to managed virtual environment: ${MANAGED_PYTHON_ENV}`));
-
-	if (uvPath) {
-		const createEnv = await $`${uvPath} venv ${MANAGED_PYTHON_ENV}`.quiet().nothrow();
-		if (createEnv.exitCode !== 0) {
-			return { success: false, usedManagedEnv: true };
-		}
-		const installInManagedEnv = await $`${uvPath} pip install --python ${MANAGED_PYTHON_ENV} ${packages}`.nothrow();
-		return { success: installInManagedEnv.exitCode === 0, usedManagedEnv: true };
-	}
-
-	const createEnv = await $`${pythonPath} -m venv ${MANAGED_PYTHON_ENV}`.quiet().nothrow();
-	if (createEnv.exitCode !== 0) {
-		return { success: false, usedManagedEnv: true };
-	}
-
-	const managedPython = managedPythonPath();
-	const installInManagedEnv = await $`${managedPython} -m pip install ${packages}`.nothrow();
-	return { success: installInManagedEnv.exitCode === 0, usedManagedEnv: true };
-}
+// Python installation helper removed: the subprocess runner has no Python
+// package dependencies beyond a working interpreter. `omp setup python --check`
+// remains as a probe; users install optional libs (pandas, matplotlib, ...)
+// directly via pip or the in-process `%pip` magic.
 
 /**
  * Run the setup command.
@@ -232,67 +140,13 @@ async function handlePythonSetup(flags: { json?: boolean; check?: boolean }): Pr
 		console.log(chalk.dim(`Using managed environment: ${check.managedEnvPath}`));
 	}
 
-	if (check.uvPath) {
-		console.log(chalk.dim(`uv: ${check.uvPath}`));
-	} else if (check.pipPath) {
-		console.log(chalk.dim(`pip: ${check.pipPath}`));
-	}
-
-	if (check.installedPackages.length > 0) {
-		console.log(chalk.green(`${theme.status.success} Installed: ${check.installedPackages.join(", ")}`));
-	}
-
-	if (check.missingPackages.length === 0) {
+	if (check.available) {
 		console.log(chalk.green(`\n${theme.status.success} Python execution is ready`));
 		return;
 	}
 
-	console.log(chalk.yellow(`${theme.status.warning} Missing: ${check.missingPackages.join(", ")}`));
-
-	if (flags.check) {
-		process.exit(1);
-	}
-
-	if (!check.uvPath && !check.pipPath) {
-		console.error(chalk.red(`\n${theme.status.error} No package manager found`));
-		console.error(chalk.dim("Install uv (recommended) or pip:"));
-		console.error(chalk.dim("  curl -LsSf https://astral.sh/uv/install.sh | sh"));
-		process.exit(1);
-	}
-
-	console.log("");
-	const install = await installPythonPackages(check.missingPackages, check.pythonPath, check.uvPath, check.pipPath);
-
-	if (!install.success) {
-		console.error(chalk.red(`\n${theme.status.error} Installation failed`));
-		console.error(chalk.dim("Try installing manually:"));
-		if (install.usedManagedEnv) {
-			if (check.uvPath) {
-				console.error(chalk.dim(`  uv venv ${MANAGED_PYTHON_ENV}`));
-				console.error(
-					chalk.dim(`  uv pip install --python ${MANAGED_PYTHON_ENV} ${check.missingPackages.join(" ")}`),
-				);
-			} else {
-				console.error(chalk.dim(`  ${check.pythonPath} -m venv ${MANAGED_PYTHON_ENV}`));
-				console.error(chalk.dim(`  ${managedPythonPath()} -m pip install ${check.missingPackages.join(" ")}`));
-			}
-		} else {
-			console.error(chalk.dim(`  ${check.uvPath ? "uv pip" : "pip"} install ${check.missingPackages.join(" ")}`));
-		}
-		process.exit(1);
-	}
-
-	const recheck = await checkPythonSetup();
-	if (recheck.available) {
-		console.log(chalk.green(`\n${theme.status.success} Python execution is ready`));
-		if (recheck.usingManagedEnv) {
-			console.log(chalk.dim(`Managed Python environment: ${recheck.managedEnvPath}`));
-		}
-	} else {
-		console.error(chalk.red(`\n${theme.status.error} Setup incomplete`));
-		console.error(chalk.dim(`Still missing: ${recheck.missingPackages.join(", ")}`));
-		process.exit(1);
-	}
+	console.error(chalk.red(`\n${theme.status.error} Python interpreter reported failure`));
+	process.exit(1);
 }
 
 async function handleSttSetup(flags: { json?: boolean; check?: boolean }): Promise<void> {
@@ -359,9 +213,8 @@ ${chalk.bold("Usage:")}
   ${APP_NAME} setup <component> [options]
 
 ${chalk.bold("Components:")}
-  python    Install Jupyter kernel dependencies for Python code execution
+  python    Verify a Python 3 interpreter is reachable for code execution
   stt       Install speech-to-text dependencies (openai-whisper, recording tools)
-            Packages: ${PYTHON_PACKAGES.join(", ")}
 
 ${chalk.bold("Options:")}
   -c, --check   Check if dependencies are installed without installing

package/src/cli/stats-cli.ts

@@ -8,6 +8,58 @@ import { APP_NAME, formatDuration, formatNumber, formatPercent } from "@oh-my-pi
 import chalk from "chalk";
 import { openPath } from "../utils/open";
 
+/**
+ * Single-line TTY progress bar. On a non-TTY stream we just stay quiet -
+ * the final "Synced ..." summary still prints either way.
+ */
+function createSyncProgressReporter(): {
+	onProgress: (event: { current: number; total: number; sessionFile: string }) => void;
+	finish: () => void;
+} {
+	const stream = process.stderr;
+	const isTty = stream.isTTY === true;
+	let lastWidth = 0;
+	let lastRender = 0;
+	return {
+		onProgress(event) {
+			if (!isTty) return;
+			const now = Date.now();
+			// Throttle to ~30 fps and always force a render for the last file.
+			if (event.current < event.total && now - lastRender < 33) return;
+			lastRender = now;
+			const label = chalk.dim(shortenSessionFile(event.sessionFile));
+			const pct = ((event.current / event.total) * 100).toFixed(0).padStart(3, " ");
+			const counter = chalk.cyan(`[${event.current}/${event.total}]`);
+			const line = `${counter} ${pct}%  ${label}`;
+			const columns = stream.columns ?? 120;
+			const trimmed = truncateToColumns(line, columns - 1);
+			stream.write(`\r${trimmed.padEnd(lastWidth)}`);
+			lastWidth = trimmed.length;
+		},
+		finish() {
+			if (!isTty || lastWidth === 0) return;
+			stream.write(`\r${" ".repeat(lastWidth)}\r`);
+			lastWidth = 0;
+		},
+	};
+}
+
+function shortenSessionFile(p: string): string {
+	const marker = "/sessions/";
+	const idx = p.indexOf(marker);
+	return idx >= 0 ? p.slice(idx + marker.length) : p;
+}
+
+function truncateToColumns(s: string, max: number): string {
+	if (max <= 0) return "";
+	const width = Bun.stringWidth(s, { countAnsiEscapeCodes: false });
+	if (width <= max) return s;
+	// Cheap right-trim with an ellipsis - we don't need ANSI-aware slicing
+	// because the colored prefix is short and the truncated tail is the
+	// dim filename, where dropping bytes is fine.
+	return `${s.slice(0, Math.max(0, max - 1))}\u2026`;
+}
+
 // =============================================================================
 // Types
 // =============================================================================
@@ -74,8 +126,10 @@ export async function runStatsCommand(cmd: StatsCommandArgs): Promise<void> {
 	);
 
 	// Sync session files first
-	console.log("Syncing session files...");
-	const { processed, files } = await syncAllSessions();
+	const progress = createSyncProgressReporter();
+	process.stderr.write("Syncing session files...\n");
+	const { processed, files } = await syncAllSessions({ onProgress: progress.onProgress });
+	progress.finish();
 	const total = await getTotalMessageCount();
 	console.log(`Synced ${processed} new entries from ${files} files (${total} total)\n`);
 

package/src/cli.ts

@@ -55,7 +55,6 @@ const commands: CommandEntry[] = [
 	{ name: "config", load: () => import("./commands/config").then(m => m.default) },
 	{ name: "grep", load: () => import("./commands/grep").then(m => m.default) },
 	{ name: "grievances", load: () => import("./commands/grievances").then(m => m.default) },
-	{ name: "jupyter", load: () => import("./commands/jupyter").then(m => m.default) },
 	{ name: "plugin", load: () => import("./commands/plugin").then(m => m.default) },
 	{ name: "setup", load: () => import("./commands/setup").then(m => m.default) },
 	{ name: "shell", load: () => import("./commands/shell").then(m => m.default) },

package/src/config/settings-schema.ts

@@ -1662,16 +1662,6 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
-	"python.sharedGateway": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "editing",
-			label: "Shared Python Gateway",
-			description: "Share IPython kernel gateway across pi instances",
-		},
-	},
-
 	// ────────────────────────────────────────────────────────────────────────
 	// Tools
 	// ────────────────────────────────────────────────────────────────────────

package/src/eval/eval.lark

@@ -1,16 +1,36 @@
-start: cell+
+// Canonical Eval input. Each cell is introduced by a single header line:
+//
+//   *** Cell <LANG>:"<title>" [t:<duration>] [rst]
+//
+// Attribute order is fixed: language+title, then optional timeout, then
+// optional reset flag. Title may be empty (`py:""`).
+//
+// Tokens:
+//
+//   py:"..." | js:"..."             language plus title (required)
+//   t:<digits>(ms|s|m)?             per-cell timeout (default 30s)
+//   rst                             reset this language's kernel before running
+//
+// Everything between one header line and the next (or the optional trailing
+// `*** End`, or end of input) is the cell's code, verbatim. The runtime
+// parser additionally accepts content before the first header as an implicit
+// default-language cell, but that is lenient fallback and MUST NOT be relied
+// on.
 
-cell: begin_cell attr* code_line* end_cell
-begin_cell: "*** Begin " LANG LF
-end_cell: "*** End Cell" LF?
+start: cell+ end_marker
 
-attr: title | timeout | reset
-title:   "*** Title: " /(.+)/ LF
-timeout: "*** Timeout: " /\d+(ms|s|m)?/ LF
-reset:   "*** Reset" LF
+cell: cell_header code_line*
 
-code_line: /[^\r\n]*/ LF
+cell_header: "*** Cell" WS_INLINE LANG_TITLE (WS_INLINE T_ATTR)? (WS_INLINE RST_FLAG)? LF
 
-LANG: "JS" | "TS" | "PY"
+end_marker: "*** End" LF?
+
+code_line: CODE_TEXT LF | LF
+CODE_TEXT: /([^*\r\n]|\*\*?[^*\r\n])+\*{0,2}|\*{1,2}/
+
+LANG_TITLE: ("py" | "js") ":\"" /[^"\r\n]*/ "\""
+T_ATTR:     "t:" /\d+(ms|s|m)?/
+RST_FLAG:   "rst"
 
 %import common.LF
+%import common.WS_INLINE