teddy-cli 0.1.17.dev1421__tar.gz → 0.1.17.dev1423__tar.gz

{teddy_cli-0.1.17.dev1421 → teddy_cli-0.1.17.dev1423}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1421
+Version: 0.1.17.dev1423
 Summary: The local-first, test-driven agentic engineering harness. Because you should own the means of development.
 Author: Raphael Atteritano
 License: AGPL-3.0-only

{teddy_cli-0.1.17.dev1421 → teddy_cli-0.1.17.dev1423}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1421"
+version = "0.1.17.dev1423"
 description = "The local-first, test-driven agentic engineering harness. Because you should own the means of development."
 readme = "README.md"
 keywords = [

{teddy_cli-0.1.17.dev1421 → teddy_cli-0.1.17.dev1423}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -283,13 +283,11 @@ def _run_health_checks(config_service: IConfigService) -> None:
 
 
 _GIT_PULL_TIMEOUT_SECONDS = 15
-_PULL_SKIPPED_WARNING = "⚠ Workspace pull skipped; continuing with the current branch."
-_PULL_TIMEOUT_WARNING = "⚠ Workspace pull timed out; continuing without it."
+_PULL_SKIPPED_WARNING = "⚠ Workspace pull skipped."
+_PULL_TIMEOUT_WARNING = "⚠ Workspace pull timed out."
 _PULL_GIT_UNAVAILABLE_WARNING = "⚠ Workspace pull skipped; git is unavailable."
 _PULL_UP_TO_DATE_NOTICE = "✓ Workspace up-to-date with remote"
-_PULL_IN_PROGRESS_NOTICE = "✓ Workspace pull skipped; Git operation in progress"
-_PULL_DETACHED_HEAD_NOTICE = "✓ Workspace pull skipped; detached HEAD"
-_PULL_NO_UPSTREAM_NOTICE = "✓ Workspace pull skipped; no upstream branch"
+_PULL_SKIPPED_NOTICE = "✓ Workspace pull skipped"
 _IN_PROGRESS_GIT_MARKERS = (
     "rebase-merge",
     "rebase-apply",
@@ -325,11 +323,12 @@ def _pull_workspace_on_start(
     The pull runs only when ``workspace.pull`` is enabled and the workspace is
     a Git repository, so a disabled toggle or a non-repository directory stays
     silent. A detached HEAD, a missing upstream, or an in-progress operation
-    reports one checkmark notice, because the user needs a pull outcome on
-    every run. A dirty worktree, a failed pull, a timeout, or an unavailable
-    git binary reports one warning and leaves the workspace unchanged. A
-    successful fast-forward names the number of commits it moved, and a pull
-    that moves no commit confirms the workspace is up to date.
+    reports one generic checkmark notice, because the user needs a pull outcome
+    on every run without the diagnostic detail. A dirty worktree, a failed
+    pull, a timeout, or an unavailable git binary reports one warning and
+    leaves the workspace unchanged. A successful fast-forward names the number
+    of commits it moved, and a pull that moves no commit confirms the workspace
+    is up to date.
 
     The Git process is injected through ``run_func`` so every decision is
     testable without spawning a real repository.
@@ -352,16 +351,15 @@ def _fast_forward_workspace(git_run: Callable[..., Any]) -> None:
 
     Each precondition is probed before the pull so an unsafe state never
     reaches ``git pull``. A dirty worktree reports one warning, while every
-    other unsafe state reports one checkmark notice so the user always sees a
-    pull outcome.
+    other unsafe state reports one generic checkmark notice so the user always
+    sees a pull outcome.
     """
     skip = _pull_skip_reason(git_run)
     if skip is not None:
-        message, is_warning = skip
-        if is_warning:
-            _warn_pull(message)
+        if skip:
+            _warn_pull(_PULL_SKIPPED_WARNING)
         else:
-            _notice_pull(message)
+            _notice_pull(_PULL_SKIPPED_NOTICE)
         return
     before = _read_head(git_run)
     result = git_run(
@@ -377,33 +375,31 @@ def _fast_forward_workspace(git_run: Callable[..., Any]) -> None:
     _report_fast_forward(git_run, before, _read_head(git_run))
 
 
-def _pull_skip_reason(
-    git_run: Callable[..., Any],
-) -> Optional[tuple[str, bool]]:
-    """Return the outcome text and severity, or None when the pull may proceed.
+def _pull_skip_reason(git_run: Callable[..., Any]) -> Optional[bool]:
+    """Return the skip severity, or None when the pull may proceed.
 
-    Each unsafe state names its own reason, because the user needs a pull
-    outcome on every run. The boolean marks a warning (``True``) versus a
-    checkmark notice (``False``). A dirty worktree returns the skipped
-    warning, because tracked changes can conflict.
+    Every skip prints one generic notice, so the caller only needs to know
+    whether an attention-worthy warning replaces it. The boolean marks a
+    warning (``True``) versus a checkmark notice (``False``). A dirty worktree
+    returns the warning, because tracked changes can conflict.
     """
     git_dir = Path.cwd() / ".git"
     if any((git_dir / marker).exists() for marker in _IN_PROGRESS_GIT_MARKERS):
-        return _PULL_IN_PROGRESS_NOTICE, False
+        return False
     detached = git_run(
         ["git", "symbolic-ref", "-q", "HEAD"],
         capture_output=True,
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
     if detached.returncode != 0:
-        return _PULL_DETACHED_HEAD_NOTICE, False
+        return False
     upstream = git_run(
         ["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
         capture_output=True,
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
     if upstream.returncode != 0:
-        return _PULL_NO_UPSTREAM_NOTICE, False
+        return False
     status = git_run(
         ["git", "status", "--porcelain"],
         capture_output=True,
@@ -416,7 +412,7 @@ def _pull_skip_reason(
         if line and not line.startswith("??")
     ]
     if tracked_changes:
-        return _PULL_SKIPPED_WARNING, True
+        return True
     return None
 
 

{teddy_cli-0.1.17.dev1421 → teddy_cli-0.1.17.dev1423}/src/teddy_executor/resources/templates/makefile.md

@@ -202,7 +202,7 @@ Attribution is deterministic: SHA → run → run-level + per-job conclusion (ne
 
 Key behaviors:
 
-1. **Automatic SHA and BASE resolution.** `SHA` defaults to current `HEAD` (or `COMMIT=<sha>`), and `BASE` resolves per workflow to the most recent ancestor of `SHA` that carries a run for that workflow (bounded by `BASE_DEPTH`, default 50). An explicit `BASE=<sha>` pins the baseline verbatim and skips resolution; if the pinned commit carries no run for the workflow, the target fails safe as an unknown base.
+1. **Automatic SHA and BASE resolution.** `SHA` defaults to current `HEAD` (or `COMMIT=<sha>`), and `BASE` resolves per workflow to the most recent ancestor of `SHA` that carries a run for that workflow. The target fetches one bounded list of the workflow's latest runs (`BASE_SCAN`, default 200) and intersects it with the newest `BASE_DEPTH` ancestors (`git rev-list`, default 50), so resolution costs one API call instead of one per ancestor. An explicit `BASE=<sha>` pins the baseline verbatim and skips resolution; if the pinned commit carries no run for the workflow, the target fails safe as an unknown base.
 2. **Registration lag is tolerated by a bounded retry.** CI can fail to register a run for the pushed SHA immediately. The target polls `gh run list --commit <sha>` up to `RETRY_POLLS × RETRY_SLEEP` (default 10 × 2s ≈ 20s) before attributing. It fails safe if the run never registers.
 3. **No CI is non-blocking.** If the repository has no workflow files under `.github/workflows/` (`*.yml`/`*.yaml`), the target logs `No CI configured - skipping attribution` and exits 0.
 4. **Workflow names with spaces stay whole.** The target reads workflow names one line at a time. A name such as `Publish to PyPI` is attributed as one workflow.
@@ -214,6 +214,7 @@ RETRY_POLLS ?= 10
 RETRY_SLEEP ?= 2
 DETAIL_LINES ?= 50
 BASE_DEPTH ?= 50
+BASE_SCAN ?= 200
 BASE ?=
 
 ci-watch: _preflight
@@ -250,9 +251,10 @@ ci-watch: _preflight
 	while IFS= read -r WF; do \
 	  NEW=$$(gh run list --commit "$$SHA" --workflow "$$WF" --json databaseId --jq '.[0].databaseId'); \
 	  gh run watch "$$NEW" --exit-status >/dev/null 2>&1 || true; \
-	  NEWCONC=$$(gh run view "$$NEW" --json conclusion --jq '.conclusion'); \
-	  NEWFAIL=$$(gh run view "$$NEW" --json jobs --jq '[.jobs[] | select(.conclusion=="failure") | .name] | sort | join(",")'); \
-	  NEWSTEPS=$$(gh run view "$$NEW" --json jobs --jq '[.jobs[] | select(.conclusion=="failure") | .steps[]? | select(.conclusion=="failure") | .name] | sort | join(", ")'); \
+	  NEWMETA=$$(gh run view "$$NEW" --json conclusion,jobs --jq '.conclusion, ([.jobs[] | select(.conclusion=="failure") | .name] | sort | join(",")), ([.jobs[] | select(.conclusion=="failure") | .steps[]? | select(.conclusion=="failure") | .name] | sort | join(", "))'); \
+	  NEWCONC=$$(printf '%s\n' "$$NEWMETA" | sed -n '1p'); \
+	  NEWFAIL=$$(printf '%s\n' "$$NEWMETA" | sed -n '2p'); \
+	  NEWSTEPS=$$(printf '%s\n' "$$NEWMETA" | sed -n '3p'); \
 	  if [ -n "$$NEWSTEPS" ]; then \
 	    echo "$$WF: failing step(s): $$NEWSTEPS (run $$NEW)"; \
 	    gh run view "$$NEW" --log-failed 2>/dev/null | awk -F'\t' '{ l=$$3; p=index(l,"Z "); if(p>0)l=substr(l,p+2); gsub(/\x1B\[[0-9;]*[a-zA-Z]/,"",l); gsub(/\^\[\[[0-9;]*[a-zA-Z]/,"",l); if(l ~ /^##\[group\]/ || l ~ /^##\[endgroup\]/) next; gsub(/^##\[error\]/,"Error: ",l); print l }' | tail -n $(DETAIL_LINES) | sed 's/^/    /'; \
@@ -272,33 +274,36 @@ ci-watch: _preflight
 	    echo "$$WF: unknown conclusion '$$NEWCONC' on run $$NEW blocks the session." >&2; \
 	    STATUS=1; continue; \
 	  fi; \
-	  BASE="$(BASE)"; CUR="$$SHA"; DEPTH=0; \
-	  while [ -z "$$BASE" ] && [ $$DEPTH -lt $(BASE_DEPTH) ]; do \
-	    CUR=$$(git rev-parse "$$CUR~1" 2>/dev/null) || break; \
-	    [ -n "$$CUR" ] || break; \
-	    if [ -n "$$(gh run list --commit "$$CUR" --workflow "$$WF" --json databaseId --jq '.[0].databaseId')" ]; then \
-	      BASE="$$CUR"; break; \
-	    fi; \
-	    DEPTH=$$((DEPTH + 1)); \
-	  done; \
+	  BASE="$(BASE)"; OLD=""; \
+	  if [ -n "$$BASE" ]; then \
+	    OLD=$$(gh run list --commit "$$BASE" --workflow "$$WF" --json databaseId --jq '.[0].databaseId'); \
+	  else \
+	    RUNLIST=$${TMPDIR:-/tmp}/ci-watch-runs.$$$$; \
+	    gh run list --workflow "$$WF" -L $(BASE_SCAN) --json headSha,databaseId --jq '.[] | "\(.headSha) \(.databaseId)"' > "$$RUNLIST" 2>/dev/null; \
+	    for CUR in $$(git rev-list -n $(BASE_DEPTH) "$$SHA^" 2>/dev/null); do \
+	      OLD=$$(awk -v sha="$$CUR" '$$1 == sha { print $$2; exit }' "$$RUNLIST"); \
+	      if [ -n "$$OLD" ]; then BASE="$$CUR"; break; fi; \
+	    done; \
+	    rm -f "$$RUNLIST"; \
+	  fi; \
 	  if [ -z "$$BASE" ]; then \
 	    echo "$$WF: BLOCKING failure ($$NEWFAIL) - no run-bearing ancestor (unknown base) - YOUR regression"; \
 	    echo "$$WF: no run-bearing ancestor within $(BASE_DEPTH) commits, so the baseline is unknown." >&2; \
 	    STATUS=1; continue; \
 	  fi; \
-	  OLD=$$(gh run list --commit "$$BASE" --workflow "$$WF" --json databaseId --jq '.[0].databaseId'); \
 	  if [ -z "$$OLD" ]; then \
 	    echo "$$WF: BLOCKING failure ($$NEWFAIL) - pinned base has no run (unknown base) - YOUR regression"; \
 	    echo "$$WF: pinned base $$BASE carries no run for this workflow." >&2; \
 	    STATUS=1; continue; \
 	  fi; \
-	  OLDJOBS=$$(gh run view "$$OLD" --json jobs --jq '.jobs | length'); \
+	  OLDMETA=$$(gh run view "$$OLD" --json jobs --jq '(.jobs | length), ([.jobs[] | select(.conclusion=="failure") | .name] | sort | join(","))'); \
+	  OLDJOBS=$$(printf '%s\n' "$$OLDMETA" | sed -n '1p'); \
 	  if [ "$$OLDJOBS" = "0" ]; then \
 	    echo "$$WF: BLOCKING failure ($$NEWFAIL) - base run is job-less (invalid workflow, not green) - YOUR regression"; \
 	    echo "$$WF: base run $$OLD carries zero jobs, so it cannot prove a green baseline." >&2; \
 	    STATUS=1; continue; \
 	  fi; \
-	  OLDFAIL=$$(gh run view "$$OLD" --json jobs --jq '[.jobs[] | select(.conclusion=="failure") | .name] | sort | join(",")'); \
+	  OLDFAIL=$$(printf '%s\n' "$$OLDMETA" | sed -n '2p'); \
 	  SUBSET=$$(awk -v new="$$NEWFAIL" -v old="$$OLDFAIL" 'BEGIN { n=split(new,na,","); m=split(old,oa,","); for (i=1;i<=n;i++) { if (na[i]=="") continue; f=0; for (j=1;j<=m;j++) { if (oa[j]==na[i]) { f=1; break } } if (!f) { print "regression"; exit } } print "pre-existing" }' </dev/null); \
 	  if [ "$$SUBSET" = "pre-existing" ]; then \
 	    echo "$$WF: pre-existing BLOCKING failure ($$NEWFAIL) - not yours"; \