Refresh harness plugins on update, and tell users an update exists #12
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,3 +13,4 @@ __pycache__/ | |
| /graph/graph | ||
| /graph/graph.exe | ||
| /dist/ | ||
| /.docket-managed | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ import subprocess | |
| import sys | ||
| import tempfile | ||
| import textwrap | ||
| import time | ||
| from pathlib import Path | ||
|
|
||
| _LIB_DIR = Path(__file__).resolve().parent.parent / "lib" | ||
|
|
@@ -1147,13 +1148,31 @@ def auto_scope_files(limit: int = _AUTO_SCOPE_LIMIT) -> tuple[str, ...]: | |
| return tuple(paths[:limit]) | ||
|
|
||
|
|
||
| def update_line() -> str | None: | ||
| """One notice line, or None. Never performs a network request.""" | ||
| from docket_update import disabled, due, notice, read_state, spawn_fetch | ||
|
|
||
| try: | ||
| if disabled(): | ||
| return None | ||
| root = Path(__file__).resolve().parent.parent | ||
| state = read_state() | ||
| if due(state, time.time()): | ||
| spawn_fetch(Path(__file__).resolve()) | ||
| return notice(version(), str(state.get("latest", "")), root) | ||
| except Exception: | ||
| return None | ||
|
|
||
|
|
||
| def _print_context(text: str, args: argparse.Namespace, | ||
| notice: str | None = None) -> int: | ||
| body = f"{notice}\n{text}" if notice else text | ||
| if not body: | ||
| return 0 | ||
| if args.for_harness: | ||
| print(json.dumps(CONTEXT_ENVELOPES[args.for_harness](body))) | ||
| else: | ||
| print(body, end="") | ||
| return 0 | ||
|
|
||
|
|
||
|
|
@@ -1165,6 +1184,7 @@ def cmd_context(args: argparse.Namespace) -> int: | |
| except ConfigError as exc: | ||
| print(f"docket: {exc}", file=sys.stderr) | ||
| return 1 | ||
| line = update_line() | ||
| # Validate against the loaded minimum, not a literal. A config that raises | ||
| # budget.minimum would otherwise let a too-small value through and surface | ||
| # as an uncaught ValueError from the renderer. | ||
|
|
@@ -1189,7 +1209,7 @@ def cmd_context(args: argparse.Namespace) -> int: | |
| max_chars=args.max_chars, ledger=str(ledger_path()), | ||
| settings=settings) | ||
| if delta is not None: | ||
| return _print_context(delta, args, line) | ||
| print(f"docket: baseline {args.since} is unknown or stale; " | ||
| "printing a full briefing", file=sys.stderr) | ||
|
|
||
|
|
@@ -1213,7 +1233,7 @@ def cmd_context(args: argparse.Namespace) -> int: | |
| except (LedgerError, OSError) as exc: | ||
| print(str(exc), file=sys.stderr) | ||
| return 1 | ||
| return _print_context(text, args, line) | ||
|
|
||
|
|
||
| _COMPLETION_FLAGS = ( | ||
|
|
@@ -1223,9 +1243,9 @@ _COMPLETION_FLAGS = ( | |
| "--auto-scope", "--no-auto-scope", "--since", "--at", | ||
| "--all", "--find", "--superseded", "--oneline", "--json", "--plain", "--pretty", | ||
| "--style", "--interactive", "--no-interactive", "--for", "--version", | ||
| "--dry-run", "--check", | ||
| ) | ||
| _COMPLETION_CMDS = ("claim", "decision", "question", "list", "show", "graph", "context", "where", "check", "rebase", "migrate", "init", "completion", "update") | ||
|
|
||
| _BASH_COMPLETION = f"""\ | ||
| _docket() {{ | ||
|
|
@@ -1294,6 +1314,79 @@ def cmd_completion(args: argparse.Namespace) -> int: | |
| return 0 | ||
|
|
||
|
|
||
| LAUNCHER_URL_TEMPLATE = ( | ||
| "https://raw.githubusercontent.com/NovusEdge/docket/refs/tags/{tag}/" | ||
| "installer/install.py" | ||
| ) | ||
| MAIN_LAUNCHER_URL = ( | ||
| "https://raw.githubusercontent.com/NovusEdge/docket/main/installer/install.py" | ||
| ) | ||
|
|
||
|
|
||
| def cmd_update(args: argparse.Namespace, root: Path | None = None) -> int: | ||
| from docket_update import is_newer, parse_version, read_state, shape, update_command | ||
|
|
||
| root = root or Path(__file__).resolve().parent.parent | ||
| running = version() | ||
| latest = str(read_state().get("latest", "")) | ||
| if args.check: | ||
| if not latest or parse_version(latest) is None: | ||
| print("docket: no cached release information yet") | ||
| return 2 | ||
| if is_newer(latest, running): | ||
| print(f"docket {latest.lstrip('v')} is available (running {running})") | ||
| return 1 | ||
| print(f"docket {running} is up to date") | ||
| return 0 | ||
|
|
||
| kind = shape(root) | ||
| if kind == "plugin": | ||
| print(f"docket: this copy is managed by your harness. " | ||
| f"Run: {update_command(root)}") | ||
| return 0 | ||
| if kind == "unknown": | ||
| print(f"docket: this copy has no installer and no repository. " | ||
| f"Run: {update_command(root)}") | ||
| return 0 | ||
| if kind == "source": | ||
| command = [sys.executable, str(root / "installer" / "install.py"), | ||
| "--checkout", str(root), "--update"] | ||
| print(" ".join(command)) | ||
| return subprocess.call(command) | ||
| tag = latest if latest and parse_version(latest) is not None else None | ||
| return _run_downloaded_update(tag) | ||
|
|
||
|
|
||
| def _run_downloaded_update(tag: str | None) -> int: | ||
| """Fetch the launcher and run it outside the checkout. | ||
|
|
||
| The bundled launcher takes its own checkout branch, which needs Go and | ||
| passes --checkout, and --checkout makes the planner skip the git update. | ||
| Without a cached release tag, fall back to the main branch so a fresh | ||
| install (no cache populated yet) can still update. | ||
| """ | ||
| from urllib.request import urlopen | ||
|
|
||
| url = LAUNCHER_URL_TEMPLATE.format(tag=tag) if tag else MAIN_LAUNCHER_URL | ||
| with tempfile.TemporaryDirectory() as work: | ||
| launcher = Path(work) / "install.py" | ||
| try: | ||
| with urlopen(url, timeout=30) as response: | ||
| launcher.write_bytes(response.read()) | ||
| except OSError as exc: | ||
| print(f"docket: could not download the installer: {exc}", file=sys.stderr) | ||
| return 1 | ||
| command = [sys.executable, str(launcher), "--update"] | ||
| print(" ".join(command)) | ||
| return subprocess.call(command, cwd=work) | ||
|
Comment on lines
+1360
to
+1381
There was a problem hiding this comment. 🔒 Security & Privacy | 🛡️ Analyzed with Security Review | 🟠 Major | 🏗️ Heavy lift 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -eu
printf '%s\n' '--- URL definitions and function references ---'
rg -n -C 5 'MAIN_LAUNCHER_URL|LAUNCHER_URL_TEMPLATE|_run_downloaded_update|docket update|def .*update|--update' bin/docket
printf '%s\n' '--- integrity-related code in the same file ---'
rg -n -i -C 3 'sha256|checksum|hash|signature|verify|trusted|installer.py|urlopen' bin/docketRepository: NovusEdge/docket Length of output: 3926 Security Misconfiguration Reachability: External Verify the launcher before execution. When no tag is cached, 🤖 Prompt for AI Agents |
||
|
|
||
|
|
||
| def cmd_update_fetch(args: argparse.Namespace) -> int: | ||
| from docket_update import run_fetch | ||
|
|
||
| return run_fetch(time.time()) | ||
|
|
||
|
|
||
| def _add_shared_args(p: argparse.ArgumentParser) -> None: | ||
| p.add_argument("--scope", action="append", default=[]) | ||
| p.add_argument("--rationale", default="") | ||
|
|
@@ -1315,7 +1408,9 @@ def main(argv: list[str] | None = None) -> int: | |
| ) | ||
| p.add_argument("-h", "--help", action=HelpAction, nargs=0, help="show this help and exit") | ||
| p.add_argument("--version", action=VersionAction, nargs=0, help="print the release and exit") | ||
| sub = p.add_subparsers(dest="cmd", metavar=( | ||
| "{claim,decision,question,list,show,graph,context,where,check," | ||
| "rebase,migrate,init,completion,update}")) | ||
|
|
||
| cl = sub.add_parser("claim", help="record a proposition") | ||
| cl.add_argument("text") | ||
|
|
@@ -1418,6 +1513,13 @@ def main(argv: list[str] | None = None) -> int: | |
| co.add_argument("shell", choices=("bash", "zsh", "fish")) | ||
| co.set_defaults(func=cmd_completion) | ||
|
|
||
| ud = sub.add_parser("update", help="update this Docket installation") | ||
| ud.add_argument("--check", action="store_true", | ||
| help="report whether an update is available; change nothing") | ||
| ud.set_defaults(func=cmd_update) | ||
|
|
||
| sub.add_parser("_update-fetch").set_defaults(func=cmd_update_fetch) | ||
|
|
||
| args = p.parse_args(argv) | ||
| if args.cmd is None: | ||
| print(f"docket {version()}") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
Keep the update notice inside the
--max-charsceiling.cmd_contextpassesargs.max_charstodocket_context.build_context, but_print_contextprepends the non-emptyupdate_line()result afterward. Becausedocs/commands.md:90defines--max-charsas a hard character ceiling, the final plain or harness-wrapped body can exceed the requested limit. Truncate the combined body toargs.max_chars, or reserve space for the notice before rendering.🤖 Prompt for AI Agents