fix(shell): shorten terminal label context

rikohomeless · rikohomeless · commit fd03a0f683b8 · 2026-06-05T11:16:37.000Z
diff --git a/packages/api/tests/terminal-sessions.test.ts b/packages/api/tests/terminal-sessions.test.ts
@@ -414,7 +414,7 @@ describe("terminal sessions service", () => {
       status: "ready"
     })
     await expect(runTestEffect(lookupTerminalSessionById(second.session.id))).resolves.toMatchObject({
-      projectDisplayName: "org/repo | issue #7 (https://github.com/org/repo/issues/7) | container dg-repo-issue-7",
+      projectDisplayName: "https://github.com/org/repo/issues/7 | container dg-repo-issue-7",
       projectKey,
       session: {
         id: second.session.id,
diff --git a/packages/app/tests/docker-git/open-project-ssh.test.ts b/packages/app/tests/docker-git/open-project-ssh.test.ts
@@ -69,9 +69,9 @@ describe("openResolvedProjectSshWithUpEffect", () => {
       })
       const events = yield* _(captureOpenResolvedProjectSshWithUpEvents(item))
       expect(events).toEqual([
-        "progress:Starting project before SSH: org/repo | source https://github.com/org/repo.git | container dg-repo",
+        "progress:Starting project before SSH: https://github.com/org/repo.git | container dg-repo",
         "up:/controller/org/repo/issue-9",
-        "progress:Opening SSH terminal: org/repo | source https://github.com/org/repo.git | container dg-repo",
+        "progress:Opening SSH terminal: https://github.com/org/repo.git | container dg-repo",
         "open:ssh -p 2299 dev@127.0.0.1"
       ])
     }))
diff --git a/packages/terminal/src/core/project-terminal-label.ts b/packages/terminal/src/core/project-terminal-label.ts
@@ -48,21 +48,25 @@ const sourceUrlForContext = (repoUrl: string, path: string): string | null => {
 
 const renderIssueContext = (repoUrl: string, issueId: string): string => {
   const issueUrl = sourceUrlForContext(repoUrl, `issues/${issueId}`)
-  return issueUrl === null ? `issue #${issueId}` : `issue #${issueId} (${issueUrl})`
+  return issueUrl === null ? `issue #${issueId}` : issueUrl
 }
 
 const renderPullRequestContext = (repoUrl: string, pullRequestId: string): string => {
   const pullRequestUrl = sourceUrlForContext(repoUrl, `pull/${pullRequestId}`)
-  return pullRequestUrl === null ? `PR #${pullRequestId}` : `PR #${pullRequestId} (${pullRequestUrl})`
+  return pullRequestUrl === null ? `PR #${pullRequestId}` : pullRequestUrl
 }
 
 const renderMergeRequestContext = (mergeRequestId: string): string => `MR #${mergeRequestId}`
 
 const renderSourceContext = (repoUrl: string, repoRef: string): string => {
+  const trimmedUrl = repoUrl.trim()
   const trimmedRef = repoRef.trim()
+  if (trimmedUrl.length === 0) {
+    return trimmedRef.length === 0 || trimmedRef === "main" ? "" : trimmedRef
+  }
   return trimmedRef.length === 0 || trimmedRef === "main"
-    ? `source ${repoUrl.trim()}`
-    : `source ${repoUrl.trim()} (${trimmedRef})`
+    ? trimmedUrl
+    : `${trimmedUrl} (${trimmedRef})`
 }
 
 const parseWrappedNumericRef = (value: string, prefix: string, suffix: string): string | null => {
@@ -98,36 +102,38 @@ const appendNonEmpty = (parts: ReadonlyArray<string>, value: string): ReadonlyAr
 }
 
 /**
- * Builds the terminal-facing project label with source workspace context.
+ * Builds the terminal-facing project label with source link and container identity.
  *
  * @param project - Project identity returned by the docker-git API.
  * @returns A deterministic label for SSH terminal headers and ready messages.
  *
  * @pure true
  * @effect none
- * @invariant issue refs include an issue marker; PR refs include a PR marker; labels never omit displayName.
+ * @invariant GitHub issue/PR refs prefer canonical source URLs; labels preserve non-empty containerName.
  * @precondition project.displayName identifies the repository or fallback project label.
- * @postcondition result contains displayName, workspace source context, and non-empty containerName when present.
+ * @postcondition result contains workspace source link/context and non-empty containerName when present.
  * @complexity O(n) where n = |repoUrl| + |repoRef|
  * @throws Never
  */
-// CHANGE: surface clone-source context in SSH terminal labels
-// WHY: terminal headers must identify issue/PR source and container instead of only the repo path
-// QUOTE(ТЗ): "надо писать какой Issues какой PR вообещ что за конетейнер"
+// CHANGE: keep SSH terminal labels to source link/context plus container identity
+// WHY: verbose repository + issue text duplicates the source URL and crowds the terminal header
+// QUOTE(ТЗ): "ссылки и название контейнера будет предостаточно"
 // REF: issue-370
 // SOURCE: n/a
-// FORMAT THEOREM: forall p: label(p) contains displayName(p) and context(repoUrl(p), repoRef(p))
+// FORMAT THEOREM: forall p: label(p) contains context(repoUrl(p), repoRef(p)) or containerName(p)
 // PURITY: CORE
 // EFFECT: none
 // INVARIANT: issue-* -> issue context; refs/pull/*/head -> PR context; containerName is preserved when non-empty
 // COMPLEXITY: O(n)
 export const projectTerminalLabel = (project: ProjectTerminalLabelInput): string => {
-  const displayName = project.displayName.trim()
-  const baseName = displayName.length === 0 ? project.repoUrl.trim() : displayName
-  const withContext = appendNonEmpty([baseName], renderWorkspaceContext(project.repoUrl, project.repoRef))
+  const withContext = appendNonEmpty([], renderWorkspaceContext(project.repoUrl, project.repoRef))
   const containerName = project.containerName?.trim() ?? ""
   const withContainer = containerName.length === 0
     ? withContext
     : appendNonEmpty(withContext, `container ${containerName}`)
-  return withContainer.join(" | ")
+  if (withContainer.length > 0) {
+    return withContainer.join(" | ")
+  }
+  const displayName = project.displayName.trim()
+  return displayName.length === 0 ? project.repoUrl.trim() : displayName
 }
diff --git a/packages/terminal/tests/core/project-terminal-label.test.ts b/packages/terminal/tests/core/project-terminal-label.test.ts
@@ -36,6 +36,10 @@ const paddedReadableLabelArbitrary = fc.tuple(
   fc.constantFrom("", " ", "  ")
 ).map(([left, value, right]) => `${left}${value}${right}`)
 
+const blankLabelArbitrary = fc.constantFrom("", " ", "  ")
+
+const emptyOrMainRefArbitrary = fc.constantFrom("", " ", "  ", "main")
+
 const repositoryArbitrary = fc.record({
   owner: gitHubPathSegmentArbitrary,
   repo: gitHubPathSegmentArbitrary
@@ -54,48 +58,57 @@ const assertRepositoryRefIdProperty = (
   fc.assert(fc.property(repositoryArbitrary, refIdArbitrary, assertion))
 }
 
+const projectFeatureLabelWithContainer = (
+  { owner, repo }: GeneratedRepository,
+  containerName: string
+): string =>
+  projectTerminalLabel({
+    containerName,
+    displayName: `${owner}/${repo}`,
+    repoRef: "feature-x",
+    repoUrl: `https://github.com/${owner}/${repo}.git`
+  })
+
 describe("projectTerminalLabel", () => {
-  it("renders GitHub issue source context and container identity", () => {
+  it("renders GitHub issue source URL and container identity", () => {
     expect(projectTerminalLabel({
       containerName: "dg-repo-issue-7",
       displayName: "org/repo",
       repoRef: "issue-7",
       repoUrl: "https://github.com/org/repo.git"
-    })).toBe("org/repo | issue #7 (https://github.com/org/repo/issues/7) | container dg-repo-issue-7")
+    })).toBe("https://github.com/org/repo/issues/7 | container dg-repo-issue-7")
   })
 
-  it("renders GitHub pull request source context from pull refs", () => {
+  it("renders GitHub pull request source URL from pull refs", () => {
     expect(projectTerminalLabel({
       containerName: "dg-repo-pr-42",
       displayName: "org/repo",
       repoRef: "refs/pull/42/head",
       repoUrl: "git@github.com:org/repo.git"
-    })).toBe("org/repo | PR #42 (https://github.com/org/repo/pull/42) | container dg-repo-pr-42")
+    })).toBe("https://github.com/org/repo/pull/42 | container dg-repo-pr-42")
   })
 
   it("renders repository source context for ordinary refs", () => {
     expect(projectTerminalLabel({
       displayName: "org/repo",
       repoRef: "feature-x",
       repoUrl: "https://github.com/org/repo.git"
-    })).toBe("org/repo | source https://github.com/org/repo.git (feature-x)")
+    })).toBe("https://github.com/org/repo.git (feature-x)")
   })
 
-  it("preserves issue markers and GitHub issue URLs for generated issue refs", () => {
+  it("property-based invariant: issue-N mapping generates canonical GitHub issue URLs", () => {
     assertRepositoryRefIdProperty(({ owner, repo }, issueId) => {
       const label = projectTerminalLabel({
         displayName: `${owner}/${repo}`,
         repoRef: `issue-${issueId}`,
         repoUrl: `https://github.com/${owner}/${repo}.git`
       })
 
-      expect(label).toBe(
-        `${owner}/${repo} | issue #${issueId} (https://github.com/${owner}/${repo}/issues/${issueId})`
-      )
+      expect(label).toBe(`https://github.com/${owner}/${repo}/issues/${issueId}`)
     })
   })
 
-  it("preserves PR and MR markers for generated review refs", () => {
+  it("property-based invariant: PR/MR markers generate review source context", () => {
     fc.assert(
       fc.property(
         repositoryArbitrary,
@@ -111,54 +124,91 @@ describe("projectTerminalLabel", () => {
 
           expect(label).toBe(
             refKind === "pull"
-              ? `${owner}/${repo} | PR #${reviewId} (https://github.com/${owner}/${repo}/pull/${reviewId})`
-              : `${owner}/${repo} | MR #${reviewId}`
+              ? `https://github.com/${owner}/${repo}/pull/${reviewId}`
+              : `MR #${reviewId}`
           )
         }
       )
     )
   })
 
-  it("uses repoUrl as the base label when displayName is blank", () => {
+  it("property-based invariant: displayName/repoUrl fallback is deterministic without source context", () => {
+    fc.assert(
+      fc.property(
+        paddedReadableLabelArbitrary,
+        blankLabelArbitrary,
+        emptyOrMainRefArbitrary,
+        (displayName, repoUrl, repoRef) => {
+          expect(projectTerminalLabel({
+            displayName,
+            repoRef,
+            repoUrl
+          })).toBe(displayName.trim())
+        }
+      )
+    )
+
     fc.assert(
-      fc.property(repositoryArbitrary, fc.constantFrom("", " ", "  "), ({ owner, repo }, displayName) => {
+      fc.property(
+        paddedReadableLabelArbitrary,
+        blankLabelArbitrary,
+        emptyOrMainRefArbitrary,
+        (repoUrl, displayName, repoRef) => {
+          expect(projectTerminalLabel({
+            displayName,
+            repoRef,
+            repoUrl
+          })).toBe(repoUrl.trim())
+        }
+      )
+    )
+  })
+
+  it("property-based invariant: repoUrl fallback is used when displayName is blank", () => {
+    fc.assert(
+      fc.property(repositoryArbitrary, blankLabelArbitrary, ({ owner, repo }, displayName) => {
         const repoUrl = `https://github.com/${owner}/${repo}.git`
 
         expect(projectTerminalLabel({
           displayName,
           repoRef: "main",
           repoUrl
-        })).toBe(`${repoUrl} | source ${repoUrl}`)
+        })).toBe(repoUrl)
       })
     )
   })
 
-  it("normalizes empty and main refs to source context without ref suffix", () => {
+  it("property-based invariant: empty/main ref handling omits ref suffix", () => {
     fc.assert(
-      fc.property(repositoryArbitrary, fc.constantFrom("", " ", "  ", "main"), ({ owner, repo }, repoRef) => {
+      fc.property(repositoryArbitrary, emptyOrMainRefArbitrary, ({ owner, repo }, repoRef) => {
         const repoUrl = `https://github.com/${owner}/${repo}.git`
 
         expect(projectTerminalLabel({
           displayName: `${owner}/${repo}`,
           repoRef,
           repoUrl
-        })).toBe(`${owner}/${repo} | source ${repoUrl}`)
+        })).toBe(repoUrl)
       })
     )
   })
 
-  it("preserves non-empty container names after trimming", () => {
+  it("property-based invariant: container handling preserves non-empty container names after trimming", () => {
     fc.assert(
-      fc.property(repositoryArbitrary, paddedReadableLabelArbitrary, ({ owner, repo }, containerName) => {
-        const label = projectTerminalLabel({
-          containerName,
-          displayName: `${owner}/${repo}`,
-          repoRef: "feature-x",
-          repoUrl: `https://github.com/${owner}/${repo}.git`
-        })
+      fc.property(repositoryArbitrary, paddedReadableLabelArbitrary, (repository, containerName) => {
+        const label = projectFeatureLabelWithContainer(repository, containerName)
 
         expect(label.endsWith(` | container ${containerName.trim()}`)).toBe(true)
       })
     )
   })
+
+  it("property-based invariant: container handling omits blank container names", () => {
+    fc.assert(
+      fc.property(repositoryArbitrary, blankLabelArbitrary, (repository, containerName) => {
+        const label = projectFeatureLabelWithContainer(repository, containerName)
+
+        expect(label).not.toContain("container ")
+      })
+    )
+  })
 })
diff --git a/scripts/e2e/clone-auto-open-ssh.sh b/scripts/e2e/clone-auto-open-ssh.sh
@@ -246,7 +246,7 @@ fi
 grep -Fq -- "Project created: octocat/hello-world" "$CLONE_LOG" \
   || fail "expected clone log to confirm project creation"
 
-grep -Fq -- "SSH terminal: octocat/hello-world | issue #1 (https://github.com/octocat/Hello-World/issues/1) | container $CONTAINER_NAME" "$CLONE_LOG" \
+grep -Fq -- "SSH terminal: https://github.com/octocat/Hello-World/issues/1 | container $CONTAINER_NAME" "$CLONE_LOG" \
   || fail "expected clone log to show SSH auto-open header with issue URL and container"
 
 [[ -f "$SSH_INVOCATION_LOG" ]] || fail "expected ssh wrapper to be invoked"
