@jals1212/ci-local-pi 0.2.0 → 0.3.1

package/CHANGELOG.md

@@ -6,6 +6,24 @@ add or change behaviour and a patch version fixes.
 
 ## Unreleased
 
+## 0.3.1
+
+### Fixed
+
+- A `ci-local.config.sh` written after the session started is now followed:
+  `ci_local_run`, or the end of a turn, sets up the status line, the cards and
+  the end card, which before came only after a `/reload`. When nothing can
+  follow the run (no UI, or no events file), `ci_local_run` no longer promises
+  a footer or an end card. (#51)
+
+## 0.3.0
+
+### Changed
+
+- Status line: a `·` separates the name from the state, as other footer
+  integrations do (`🚦 ci-local · ✓ passed · 4m12s`, was
+  `🚦 ci-local ✓ passed · 4m12s`). (#45)
+
 ## 0.2.0
 
 ### Added

package/README.md

@@ -23,8 +23,8 @@ In a session opened inside a repository with `ci-local.config.sh` (with a
 literal `CI_PROJECT=`), it follows the events file of that project; it never
 runs ci-local or Docker itself:
 
-- **Status line**: `🚦 ci-local ◌ queued · 2 ahead (erp-ci running)`, `🚦 ci-local ⧗ [3/8] lint · 2m05s`,
-  then `🚦 ci-local ✓ passed · 4m12s` or `🚦 ci-local ✗ failed at lint · 2m10s` until
+- **Status line**: `🚦 ci-local · ◌ queued · 2 ahead (erp-ci running)`, `🚦 ci-local · ⧗ [3/8] lint · 2m05s`,
+  then `🚦 ci-local · ✓ passed · 4m12s` or `🚦 ci-local · ✗ failed at lint · 2m10s` until
   the next run. A run already over when a session starts shows only while its
   result is undelivered, like an unread message: it ended with no session of
   the repository open. Once a session has shown it finished, a later session

package/extensions/ci-local.ts

@@ -1,8 +1,8 @@
 // Pi extension for @jals1212/ci-local: the state of this repository's
 // ci-local run in Pi's own UI, so neither the agent nor you write it by hand.
 //
-// - Status line: `🚦 ci-local ⧗ [3/8] lint · 2m05s`, `🚦 ci-local ◌ queued ·
-//   2 ahead (erp-ci running)`, then `🚦 ci-local ✓ passed · 4m12s` / `🚦 ci-local
+// - Status line: `🚦 ci-local · ⧗ [3/8] lint · 2m05s`, `🚦 ci-local · ◌ queued ·
+//   2 ahead (erp-ci running)`, then `🚦 ci-local · ✓ passed · 4m12s` / `🚦 ci-local ·
 //   ✗ failed at lint` until the next run (🚦 is ci-local's own emoji, see BRAND).
 //   A run already over when a session starts is shown only if no session
 //   showed its result yet, like a message not yet delivered (createStatusLine).
@@ -89,6 +89,9 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
   // agent_start to agent_settled (in-run compaction and retries included).
   let delivery: ReturnType<typeof createDelivery> | undefined
   let runActive = false
+  // The reason of the session's session_start (createStatusLine reads it);
+  // undefined before one and after session_shutdown, when nothing is followed.
+  let startReason: string | undefined
   // The runs ci_local_run started, by pid, until their run shows in the events
   // file (seen) or they end. One that ends unseen, after the tool returned,
   // gets an end card of its own (exitCard): no event will ever name it. Each
@@ -104,7 +107,10 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
     runActive = false
     delivery?.boundary()
   })
-  pi.on('turn_end', async () => delivery?.boundary())
+  pi.on('turn_end', async (_event, ctx) => {
+    follow(ctx)
+    delivery?.boundary()
+  })
   pi.on('session_compact', async () => delivery?.boundary())
   pi.on('session_compact_failed', async () => delivery?.boundary())
 
@@ -167,6 +173,8 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
     async execute(_id, params, signal, _onUpdate, ctx) {
       const found = findProject(ctx.cwd)
       if (!found) throw new Error(`no ci-local.config.sh with a literal CI_PROJECT at or above ${ctx.cwd}`)
+      // Followed before the launch, so the tracker is there when the run starts.
+      const followed = follow(ctx)
       const sessionId = ctx.sessionManager.getSessionId()
       const launch = launchRun({ repo: found.repo, args: params.args ?? [], sessionId })
       const tracked: Launch = Object.assign(launch, { seen: false, waiting: true, sessionId })
@@ -178,7 +186,7 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
         if (launch.pid !== undefined) launches.delete(launch.pid)
         if (launch.error) throw new Error(`cannot start ${launch.bin}: ${launch.error}`)
       }
-      return { content: [{ type: 'text', text: launchReport(result, launch, found.project) }], details: { kind: result.kind, pid: launch.pid } }
+      return { content: [{ type: 'text', text: launchReport(result, launch, found.project, { followed }) }], details: { kind: result.kind, pid: launch.pid } }
     },
   })
 
@@ -197,11 +205,25 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
   pi.on('session_start', async (event, ctx: ExtensionContext) => {
     stop()
     runActive = false
-    if (!ctx.hasUI) return
+    startReason = event.reason
+    follow(ctx)
+  })
+
+  /**
+   * Sets up what follows the runs of the session's repository (the tick timer,
+   * the status line, the cards, the delivery to the agent); true once it is
+   * running. session_start calls it, and so do ci_local_run and turn_end while
+   * nothing is followed yet: a ci-local.config.sh written during the session
+   * is picked up then, not only after a /reload (#51).
+   */
+  function follow(ctx: ExtensionContext): boolean {
+    if (timer) return true
+    if (startReason === undefined || !ctx.hasUI) return false
+    const reason = startReason
     const found = findProject(ctx.cwd)
-    if (!found) return
+    if (!found) return false
     const file = eventsFileFor(found.project, process.env, found.repo)
-    if (!file) return // CI_LOCAL_EVENTS=off, or no private cache: runs write no events
+    if (!file) return false // CI_LOCAL_EVENTS=off, or no private cache: runs write no events
     const tracker = createTracker()
     // Start cards this session already shows (a reload, a resumed session): not again.
     for (const entry of ctx.sessionManager.getBranch()) {
@@ -226,7 +248,7 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
     // The status line leaves out a run already over whose result a session
     // already showed, and records each finished run it shows (see
     // createStatusLine in core.js).
-    const statusLine = createStatusLine({ file, sessionId, reason: event.reason })
+    const statusLine = createStatusLine({ file, sessionId, reason })
 
     const tick = () => {
       let run
@@ -309,10 +331,12 @@ function ciLocal(pi: ExtensionAPI, { launchWaitMs }: { launchWaitMs: number }) {
     tick()
     timer = setInterval(tick, POLL_MS)
     timer.unref?.()
-  })
+    return true
+  }
 
   pi.on('session_shutdown', async () => {
     stop()
+    startReason = undefined
     delete (globalThis as Record<symbol, unknown>)[FLAG]
   })
 }

package/extensions/core.js

@@ -284,10 +284,10 @@ export function createStatusLine({ file, sessionId, reason }) {
   }
 }
 
-/** One short line for the footer: `🚦 ci-local ✓ passed · 4m12s`. */
+/** One short line for the footer: `🚦 ci-local · ✓ passed · 4m12s`. */
 export function footerText(state) {
   // The state's glyph sits by the state, after the name.
-  return `${BRAND} ci-local ${GLYPHS[state.state] ?? GLYPHS.stopped} ${stateText(state)}`
+  return `${BRAND} ci-local · ${GLYPHS[state.state] ?? GLYPHS.stopped} ${stateText(state)}`
 }
 
 /** The state of a run in a few words, as the footer says it after its glyph. */
@@ -618,14 +618,21 @@ function endedLine(launch) {
   return `ci-local ${verb} ${howEnded(launch)} before a run started`
 }
 
-/** What ci_local_run tells the agent of a launch and how it stands. */
-export function launchReport(result, launch, project) {
+/**
+ * What ci_local_run tells the agent of a launch and how it stands. followed:
+ * whether this session follows the run (a footer and an end card will come).
+ */
+export function launchReport(result, launch, project, { followed = true } = {}) {
   const where = `Output: ${launch.output}.`
-  const follow = 'The footer follows it and its end card reaches you when it ends: do not poll, sleep or run `ci-local --status`.'
+  const follow = followed
+    ? 'The footer follows it and its end card reaches you when it ends: do not poll, sleep or run `ci-local --status`.'
+    : 'This session cannot follow it (no UI, or no events file to read), so no footer or end card will come: read its output, or ask ci_local_status.'
   if (result.kind === 'started')
     return `ci-local started (pid ${launch.pid}) for ${project}: ${stateText(result.run.state)}. ${follow} ${where}`
-  if (result.kind === 'waiting')
-    return `ci-local launched (pid ${launch.pid}) for ${project}, no event yet: another run of ${project} may hold its events file until it ends. ${follow} ${where}`
+  if (result.kind === 'waiting') {
+    const why = followed ? `: another run of ${project} may hold its events file until it ends` : ''
+    return `ci-local launched (pid ${launch.pid}) for ${project}, no event yet${why}. ${follow} ${where}`
+  }
   const tail = outputTail(launch.output)
   return [
     `${endedLine(launch)}. ${where}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jals1212/ci-local-pi",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Pi extension and skill for @jals1212/ci-local: the state of this repository's ci-local run in Pi's status line, cards and a read-only tool for the agent.",
   "license": "MIT",
   "author": "jals1212",

package/skills/ci-local/SKILL.md

@@ -4,7 +4,7 @@ description: "Trigger: ci-local, run CI locally, ci-local.config.sh, CI_PROJECT,
 license: MIT
 metadata:
   author: jals1212
-  version: "0.2.0"
+  version: "0.3.1"
 ---
 
 ## Activation Contract