@meistrari/tela-cli 0.4.0 → 0.5.0

package/src/program.ts

@@ -12,9 +12,9 @@ import { RunChatHandoffScreen, RunScreen } from './ink/screens/run-screen.tsx'
 import { SetupScreen, type SetupScreenResult } from './ink/screens/setup/setup-screen.tsx'
 import { SyncScreen, type SyncProgressItem } from './ink/screens/sync-screen.tsx'
 import { renderCommandScreen } from './ink/runtime.tsx'
-import { listOrganizations } from './agent-api.ts'
+import { listAvailableRepositories, listOrganizations } from './agent-api.ts'
 import { authenticateWithDeviceFlow, type SetupAuthEvent } from './auth.ts'
-import { createUserFacingError } from './errors.ts'
+import { createUserFacingError, toUserFacingError } from './errors.ts'
 import {
     getCommandMetadata,
     listCommandMetadata,
@@ -82,6 +82,7 @@ import {
 } from './config.ts'
 import { findRepositoryRoot, getDiffStatAgainstHead } from './git.ts'
 import {
+    createGitSshKey,
     ensureForgejoUserAccess,
     listDiscoveredSshPublicKeys,
     type SelectedSshPublicKey,
@@ -89,6 +90,7 @@ import {
 import { commandExists, runInteractiveCommand, runStreamingCommand } from './process.ts'
 import { CommandRuntime } from './runtime.ts'
 import type {
+    AvailableRepositorySummary,
     BatchSyncFailure,
     SyncResult,
     TelaCliAuthState,
@@ -124,6 +126,7 @@ interface CliDeps {
     syncAllRepositories?: typeof syncAllRepositories
     syncCurrentRepository?: typeof syncCurrentRepository
     listCloneRootRepositories?: typeof listCloneRootRepositories
+    listAvailableRepositories?: typeof listAvailableRepositories
     previewPush?: typeof previewPush
     pushRepository?: typeof pushRepository
     runLocalAgentCommand?: typeof runLocalAgentCommand
@@ -265,11 +268,13 @@ function renderRootHelp(program: Command): string {
     return joinBlocks([
         bootstrapPane('Tela CLI', [
             'One-shot workflows for setting up Tela, syncing repositories, running local agents, preparing pushes, and applying commit feedback.',
+            'Run `tela` with no subcommand to list workspace repositories available to sync.',
             '',
             'First successful path:',
             stepList([
                 'tela setup',
                 'tela status',
+                'tela',
                 'tela sync <repo> or tela sync --current',
                 'tela run',
                 'tela push',
@@ -376,6 +381,7 @@ function summarizeConfigInspection(inspection: ConfigInspection): string {
         { label: 'Workspace', value: inspection.config.auth?.workspace.title ?? '<signed out>' },
         { label: 'Organization', value: inspection.config.forgejoOrganization?.name ?? '<not selected>' },
         { label: 'Forgejo user', value: inspection.config.forgejoUserRegistered ? 'registered' : 'pending' },
+        { label: 'Git SSH key', value: inspection.config.gitSshKey ? `${inspection.config.gitSshKey.title} (${inspection.config.gitSshKey.privateKeyPath})` : '<missing>' },
     ])
 }
 
@@ -406,6 +412,7 @@ async function executeSetupFlow(
     input: SetupConfigInput & {
         createCloneRoot: boolean
         sshKey: SelectedSshPublicKey
+        sshPrivateKeyPath: string
         auth: TelaCliAuthState
         organization: TelaCliForgejoOrganization
     },
@@ -427,6 +434,7 @@ async function executeSetupFlow(
         auth: input.auth,
         forgejoOrganization: input.organization,
         forgejoUserRegistered: false,
+        gitSshKey: createGitSshKey(input.sshKey, input.sshPrivateKeyPath),
     }
     const forgejoProvision = await ensureForgejoUserAccess({
         config: baseConfig,
@@ -567,6 +575,7 @@ async function runSetupInk(
                 auth: input.auth,
                 forgejoOrganization: null,
                 forgejoUserRegistered: false,
+                gitSshKey: inspection.config?.gitSshKey ?? null,
             }
             const organizations = await listOrganizations(config, deps.fetchFn ?? fetch)
             if (organizations.length === 0) {
@@ -705,6 +714,7 @@ export async function runSetup(
             { label: 'Workspace', value: config.auth?.workspace.title ?? '<missing>' },
             { label: 'Organization', value: config.forgejoOrganization?.name ?? '<missing>' },
             { label: 'Forgejo user', value: config.forgejoUserRegistered ? 'registered' : 'pending' },
+            { label: 'Git SSH key', value: config.gitSshKey ? `${config.gitSshKey.title} (${config.gitSshKey.privateKeyPath})` : '<missing>' },
             { label: 'Session', value: config.auth ? `${redactSecret(config.auth.session.accessToken)} (expires ${new Date(config.auth.session.expiresAt).toISOString()})` : '<missing>' },
         ]), { decorate: runtime.decorate }),
         section('Authentication', DEVICE_FLOW_BROWSER_HELP, { decorate: runtime.decorate }),
@@ -714,6 +724,7 @@ export async function runSetup(
                 { label: 'auth', status: 'authenticated', detail: `${config.auth?.user.email ?? '<missing>'} @ ${config.auth?.workspace.title ?? '<missing>'}` },
                 { label: 'organization', status: config.forgejoOrganization ? 'selected' : 'missing', detail: config.forgejoOrganization?.name ?? 'not selected' },
                 { label: 'forgejo-user', status: config.forgejoUserRegistered ? 'registered' : 'pending', detail: config.forgejoUserRegistered ? 'SSH-key provisioning completed.' : 'SSH-key provisioning is pending.' },
+                { label: 'git-ssh-key', status: config.gitSshKey ? 'configured' : 'missing', detail: config.gitSshKey?.privateKeyPath ?? 'rerun setup to choose an SSH key' },
                 { label: 'clone-root', status: cloneRootCreated ? 'created' : (existsSync(config.cloneRoot) ? 'ready' : 'missing'), detail: config.cloneRoot },
                 { label: 'git', status: gitAvailable ? 'available' : 'missing', detail: gitAvailable ? 'ready' : 'install git' },
                 { label: 'claude', status: claudeAvailable ? 'available' : 'missing', detail: claudeAvailable ? 'ready' : 'install Claude CLI' },
@@ -755,6 +766,26 @@ function syncCategoryFixes(category: SyncFailureCategory): string[] {
     }
 }
 
+function buildSyncFailureError(error: unknown): ReturnType<typeof createUserFacingError> {
+    const category = categorizeSyncError(error)
+    const userError = toUserFacingError(error)
+    const stderrDetails = userError.evidence
+        .find(line => line.startsWith('stderr: '))
+        ?.replace(/^stderr: /, '')
+    const stdoutDetails = userError.evidence
+        .find(line => line.startsWith('stdout: '))
+        ?.replace(/^stdout: /, '')
+
+    return createUserFacingError({
+        code: `sync_${category}`,
+        summary: error instanceof Error ? error.message : String(error),
+        details: stderrDetails || stdoutDetails || userError.details,
+        fixes: syncCategoryFixes(category),
+        evidence: userError.evidence,
+        cause: error,
+    })
+}
+
 function renderSyncPlan(input: {
     mode: SyncCommandResult['mode']
     target: string
@@ -1018,13 +1049,7 @@ async function runSyncInk(
                 }
             }
             catch (error) {
-                const category = categorizeSyncError(error)
-                throw createUserFacingError({
-                    code: `sync_${category}`,
-                    summary: error instanceof Error ? error.message : String(error),
-                    fixes: syncCategoryFixes(category),
-                    cause: error,
-                })
+                throw buildSyncFailureError(error)
             }
         },
     }))
@@ -1196,13 +1221,7 @@ export async function runSync(
         return result
     }
     catch (error) {
-        const category = categorizeSyncError(error)
-        throw createUserFacingError({
-            code: `sync_${category}`,
-            summary: error instanceof Error ? error.message : String(error),
-            fixes: syncCategoryFixes(category),
-            cause: error,
-        })
+        throw buildSyncFailureError(error)
     }
 }
 
@@ -1850,8 +1869,10 @@ export async function runDoctor(
 }
 
 export interface ListRepositoriesResult {
-    cloneRoot: string
-    repositories: string[]
+    success: boolean
+    repositories: AvailableRepositorySummary[]
+    message?: string
+    nextActions?: string[]
 }
 
 export async function runListRepositories(
@@ -1860,35 +1881,76 @@ export async function runListRepositories(
 ): Promise<ListRepositoriesResult> {
     const runtime = createRuntime(deps, options)
     const inspection = (deps.inspectSavedConfig ?? inspectSavedConfig)()
-    const cloneRoot = inspection.config?.cloneRoot ?? getDefaultCloneRoot()
-    const listRepos = deps.listCloneRootRepositories ?? listCloneRootRepositories
-    const repositories = listRepos(cloneRoot)
-    const result: ListRepositoriesResult = { cloneRoot, repositories }
+    const decorate = runtime.decorate
+    const setupRequiredNextActions = [
+        'Run `tela setup` to configure Tela CLI and sign in.',
+        'Run `tela --help` to see all available commands.',
+    ]
+    const setupRequiredMessage = 'Setup and sign-in are required before Tela can list repositories available to sync.'
+
+    if (!inspection.valid || !inspection.config?.auth) {
+        const result: ListRepositoriesResult = {
+            success: false,
+            repositories: [],
+            message: setupRequiredMessage,
+            nextActions: setupRequiredNextActions,
+        }
+
+        if (options.json) {
+            runtime.emitJson(result)
+            return result
+        }
+
+        emitBootstrap(runtime, 'Tela CLI', 'Workspace repositories available to sync.')
+        runtime.emit(joinBlocks([
+            section('Repositories', [
+                setupRequiredMessage,
+                '',
+                'These repositories will appear here after setup is complete.',
+            ], { decorate }),
+            nextActions(setupRequiredNextActions, { decorate }),
+        ]))
+
+        return result
+    }
+
+    const listRepos = deps.listAvailableRepositories ?? listAvailableRepositories
+    const repositories = await listRepos(inspection.config, deps.fetchFn ?? fetch)
+    const result: ListRepositoriesResult = {
+        success: true,
+        repositories,
+    }
 
     if (options.json) {
         runtime.emitJson(result)
         return result
     }
 
-    emitBootstrap(runtime, 'Tela CLI', 'Workspace repositories under the configured clone root.')
-    const decorate = runtime.decorate
+    emitBootstrap(runtime, 'Tela CLI', 'Workspace repositories available to sync.')
     const body = repositories.length > 0
-        ? section('Repositories', bulletList(repositories), { decorate })
+        ? section(
+            'Repositories',
+            table(
+                ['Organization', 'Repository', 'Sync'],
+                repositories.map(repository => [
+                    repository.organization.name,
+                    repository.agentRepo.repository,
+                    repository.syncStatus,
+                ]),
+                { decorate },
+            ),
+            { decorate },
+        )
         : section('Repositories', [
-            `No repositories found under ${cloneRoot}.`,
+            'No workspace repositories are currently registered for this workspace.',
             '',
-            'Next steps:',
-            bulletList([
-                'Run `tela setup` to configure the clone root.',
-                'Run `tela sync <repo>` to clone a workspace repository.',
-            ]),
+            'There is nothing to sync yet.',
         ], { decorate })
 
     runtime.emit(joinBlocks([
         body,
-        section('Clone root', cloneRoot, { decorate }),
         nextActions([
-            'Run `tela sync <repo>` to clone or refresh a repository.',
+            'Run `tela sync <repo>` to clone or refresh an available repository.',
             'Run `tela --help` to see all available commands.',
         ], { decorate }),
     ]))

package/src/types.ts

@@ -22,6 +22,12 @@ export interface TelaCliForgejoOrganization {
     name: string
 }
 
+export interface TelaCliGitSshKey {
+    title: string
+    publicKeyPath: string
+    privateKeyPath: string
+}
+
 export interface TelaCliAuthState {
     user: TelaCliUser
     workspace: TelaCliWorkspace
@@ -40,6 +46,7 @@ export interface TelaCliConfig {
     auth: TelaCliAuthState | null
     forgejoOrganization: TelaCliForgejoOrganization | null
     forgejoUserRegistered: boolean
+    gitSshKey: TelaCliGitSshKey | null
 }
 
 export interface OrganizationSummary {
@@ -75,6 +82,21 @@ export interface RepositoryLookupResponse {
     error?: string
 }
 
+export interface RepositoryListItemResponse {
+    organization: OrganizationSummary
+    agentRepo: AgentRepoSummary
+}
+
+export interface RepositoryListResponse {
+    success: boolean
+    repositories?: RepositoryListItemResponse[]
+    error?: string
+}
+
+export interface AvailableRepositorySummary extends RepositoryListItemResponse {
+    syncStatus: 'available'
+}
+
 export interface OrganizationListResponse {
     success: boolean
     organizations?: TelaCliForgejoOrganization[]