From c859967732508637126f2efac1bbff69c4ed94bc Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Tue, 26 May 2026 13:44:27 +0000
Subject: [PATCH] appview/pipelines/ssh,knotserver: use repoDID + SHA in ssh interface

as opposed to the fake ATURI

Signed-off-by: oppiliappan <me@oppi.li>
---
 knotserver/internal.go | 10 +++++++---
 knotserver/config/config.go | 2 +-
 appview/pipelines/ssh/session.go | 30 ++++++++----------------------
 3 file(s) changed, 16 insertion(s)(+), 26 deletion(s)(-)

diff --git a/knotserver/internal.go b/knotserver/internal.go
--- a/knotserver/internal.go
+++ b/knotserver/internal.go
@@ -5,6 +5,7 @@
 	"encoding/json"
 	"fmt"
 	"log/slog"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -422,9 +423,12 @@
 		EventJson: string(eventJson),
 	}
 
-	if h.c.LogsHostname != "" {
-		*clientMsgs = append(*clientMsgs, "→  Browse CI logs in your terminal:")
-		*clientMsgs = append(*clientMsgs, fmt.Sprintf("   ssh -t %s at://did:web:%s/sh.tangled.pipeline/%s", h.c.LogsHostname, h.c.Server.Hostname, event.Rkey))
+	if h.c.LogsAddr != "" {
+		host, port, err := net.SplitHostPort(h.c.LogsAddr)
+		if err == nil {
+			*clientMsgs = append(*clientMsgs, "→  Browse CI logs in your terminal:")
+			*clientMsgs = append(*clientMsgs, fmt.Sprintf("   ssh -t -p %s %s %s %s", port, host, repoDid, line.NewSha))
+		}
 	}
 
 	return h.db.InsertEvent(event, h.n)
diff --git a/knotserver/config/config.go b/knotserver/config/config.go
--- a/knotserver/config/config.go
+++ b/knotserver/config/config.go
@@ -44,7 +44,7 @@
 	Server          Server   `env:",prefix=KNOT_SERVER_"`
 	Git             Git      `env:",prefix=KNOT_GIT_"`
 	AppViewEndpoint string   `env:"APPVIEW_ENDPOINT, default=https://tangled.org"`
-	LogsHostname    string   `env:"LOGS_HOSTNAME, default=logs.tangled.org"`
+	LogsAddr        string   `env:"LOGS_ADDR, default=tangled.org:3333"`
 	KnotMirrors     []string `env:"KNOT_MIRRORS, default=https://mirror.tangled.network"`
 }
 
diff --git a/appview/pipelines/ssh/session.go b/appview/pipelines/ssh/session.go
--- a/appview/pipelines/ssh/session.go
+++ b/appview/pipelines/ssh/session.go
@@ -3,7 +3,6 @@
 import (
 	"fmt"
 
-	"github.com/bluesky-social/indigo/atproto/syntax"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/ssh"
 	wishtea "github.com/charmbracelet/wish/bubbletea"
@@ -20,36 +19,23 @@
 
 	renderer := wishtea.MakeRenderer(sess)
 
-	if len(args) != 1 {
+	if len(args) != 2 {
 		l.Warn("bad invocation", "args", args)
-		return newErrorModel(renderer, "usage: ssh -t <host> -p 2222 <at-uri>\nexample: ssh -t host -p 2222 at://did:web:knot.example/sh.tangled.pipeline/abc123"), wishtea.MakeOptions(sess)
+		return newErrorModel(renderer, "usage: ssh -t -p <port> <host> <repoDID> <sha>"), wishtea.MakeOptions(sess)
 	}
 
-	rawURI := args[0]
-	aturi, err := syntax.ParseATURI(rawURI)
-	if err != nil {
-		l.Warn("invalid AT URI", "uri", rawURI, "err", err)
-		return newErrorModel(renderer, fmt.Sprintf("invalid AT URI %q: %v", rawURI, err)), wishtea.MakeOptions(sess)
-	}
+	repoDID := args[0]
+	sha := args[1]
 
-	did := aturi.Authority().String()
-	const didWebPrefix = "did:web:"
-	if len(did) <= len(didWebPrefix) {
-		l.Warn("unsupported DID format", "did", did)
-		return newErrorModel(renderer, fmt.Sprintf("unsupported DID format %q (expected did:web:...)", did)), wishtea.MakeOptions(sess)
-	}
-	knot := did[len(didWebPrefix):]
-	rkey := aturi.RecordKey().String()
-
-	l = l.With("knot", knot, "rkey", rkey)
+	l = l.With("repoDID", repoDID, "sha", sha)
 
 	pipelines, err := db.GetPipelineStatuses(s.db, 1,
-		orm.FilterEq("p.knot", knot),
-		orm.FilterEq("p.rkey", rkey),
+		orm.FilterEq("p.repo_did", repoDID),
+		orm.FilterEq("p.sha", sha),
 	)
 	if err != nil || len(pipelines) == 0 {
 		l.Warn("pipeline not found", "err", err)
-		return newErrorModel(renderer, fmt.Sprintf("pipeline not found: %s", rawURI)), wishtea.MakeOptions(sess)
+		return newErrorModel(renderer, fmt.Sprintf("pipeline not found for repo %s @ %s", repoDID, sha)), wishtea.MakeOptions(sess)
 	}
 
 	pipeline := pipelines[0]

--
tangled.sh