Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"test:onboarding-run-targets": "bun test/test-onboarding-run-targets.mjs",
"test:run-device-command": "bun test/test-run-device-command.mjs",
"test:init-app-conflict": "bun test/test-init-app-conflict.mjs",
"test:channel-add-exists": "bun test/test-channel-add-exists.mjs",
"test:wait-log": "bun test/test-wait-log.mjs",
"test:init-guardrails": "bun test/test-init-guardrails.mjs",
"test:init-replay": "bun test/test-init-replay.mjs",
Expand Down Expand Up @@ -169,7 +170,7 @@
"test:android-version": "bun test/test-android-version.mjs",
"test:platform-flow-contract": "bun test/test-platform-flow-contract.mjs",
"test:tail-engine-shared": "bun test/test-tail-engine-shared.mjs",
"test": "bun run build && bun run test:helper-dce && bun run test:version-detection:setup && bun run test:bundle && bun run test:functional && bun run test:semver && bun run test:auto-bump-version && bun run test:auto-bump-ai-diff && bun run test:version-edge-cases && bun run test:regex && bun run test:upload && bun run test:fail-on-incompatible && bun run test:native-dependencies && bun run test:package-json-guard && bun run test:credentials && bun run test:credentials-validation && bun run test:android-service-account-validation && bun run test:build-zip-filter && bun run test:checksum && bun run test:build-needed && bun run test:ci-prompts && bun run test:ci-secrets && bun run test:android-onboarding-progress && bun run test:onboarding-telemetry && bun run test:v2-event-migration && bun run test:analytics && bun run test:cli-headers && bun run test:authenticated-command-invocation && bun run test:analytics-error-category && bun run test:analytics-org-resolver && bun run test:supabase-perf && bun run test:preview-qr && bun run test:app-set-options && bun run test:mcp-analytics && bun run test:mcp-instructions && bun run test:mcp-live-update-onboarding && bun run test:mcp-stdout-guard && bun run test:mcp-platform-select && bun run test:mcp-explain-scopes && bun run test:mcp-oauth-reopen && bun run test:mcp-broker-oauth && bun run test:mcp-broker-session && bun run test:mcp-credentials-manage && bun run test:mcp-resume-prompt && bun run test:mcp-build-job && bun run test:mcp-build-tools && bun run test:app-created-source && bun run test:app-list-output-text && bun run test:doctor-analytics && bun run test:posthog-exception && bun run test:create-supabase-client && bun run test:build-platform-selection && bun run test:builder-project-discovery && bun run test:onboarding-recovery && bun run test:onboarding-progress && bun run test:onboarding-run-targets && bun run test:run-device-command && bun run test:init-monorepo-targeting && bun run test:init-app-conflict && bun run test:wait-log && bun run test:init-guardrails && bun run test:init-replay && bun run test:init-telemetry && bun run test:prompt-preferences && bun run test:esm-sdk && bun run test:mcp && bun run test:mcp-no-key-handshake && bun run test:auth-session && bun run test:version-detection && bun run test:platform-paths && bun run test:project-type-detection && bun run test:payload-split && bun run test:manifest-path-encoding && bun run test:macos-signing && bun run test:asc-key-protocol && bun run test:apple-api-import-helpers && bun run test:apple-api-verify-key && bun run test:bundle-id-detector && bun run test:apple-api-app-list && bun run test:app-verification && bun run test:pbxproj-parser && bun run test:ai-log-capture && bun run test:ai-analyze-flow && bun run test:cicd-failure-help && bun run test:ai-sse-parser && bun run test:ai-render-markdown && bun run test:ai-stream-markdown && bun run test:ai-onboarding-mode && bun run test:ai-fit && bun run test:platform-layout && bun run test:frame-fit && bun run test:onboarding-min-size && bun run test:min-size-gate && bun run test:shell-size-gate && bun run test:build-log-sanitize && bun run test:build-output-viewport && bun run test:diff-viewer-viewport && bun run test:build-complete-exit && bun run test:ai-analyze-stream && bun run test:support-mailto && bun run test:support-redact && bun run test:support-internal-log && bun run test:support-help-menu && bun run test:support-contact && bun run test:support-upload-prompt && bun run test:support-bundle-files && bun run test:self-update && bun run test:update-prompt && bun run test:apple-api-cert-create && bun run test:android-tail-engine && bun run test:android-tail-render && bun run test:android-tail-routing && bun run test:dev-gate-stripped && bun run test:frame-fit-ios-shared && bun run test:ios-confirm-app-id && bun run test:ios-create-new && bun run test:ios-e2e && bun run test:ios-flow-contract && bun run test:ios-import-discovery && bun run test:ios-import-export && bun run test:ios-import-pickers && bun run test:ios-import-recovery && bun run test:ios-recovery && bun run test:ios-resume && bun run test:ios-tail-handoff && bun run test:ios-tui-render && bun run test:p8-error && bun run test:ios-tui-routing && bun run test:ios-updater-sync-validation && bun run test:ios-verify-app && bun run test:ios-marketing-version && bun run test:android-version && bun run test:platform-flow-contract && bun run test:tail-engine-shared && bun run test:prescan && bun run test:android-reporting-api && bun run test:android-app-verification && bun run test:android-rename && bun run test:appflow-auth && bun run test:appflow-api-map && bun run test:appflow-validate && bun run test:appflow-flow && bun run test:appflow-gapfill && bun run test:appflow-engine && bun run test:appflow-tail && bun run test:appflow-fetch && bun run test:appflow-sa-decode && bun run test:app-permission-helper && bun run test:2fa-compliance-network && bun run test:organization-set-api-host && bun run test:trial-warning && bun run test:plan-validation",
"test": "bun run build && bun run test:helper-dce && bun run test:version-detection:setup && bun run test:bundle && bun run test:functional && bun run test:semver && bun run test:auto-bump-version && bun run test:auto-bump-ai-diff && bun run test:version-edge-cases && bun run test:regex && bun run test:upload && bun run test:fail-on-incompatible && bun run test:native-dependencies && bun run test:package-json-guard && bun run test:credentials && bun run test:credentials-validation && bun run test:android-service-account-validation && bun run test:build-zip-filter && bun run test:checksum && bun run test:build-needed && bun run test:ci-prompts && bun run test:ci-secrets && bun run test:android-onboarding-progress && bun run test:onboarding-telemetry && bun run test:v2-event-migration && bun run test:analytics && bun run test:cli-headers && bun run test:authenticated-command-invocation && bun run test:analytics-error-category && bun run test:analytics-org-resolver && bun run test:supabase-perf && bun run test:preview-qr && bun run test:app-set-options && bun run test:mcp-analytics && bun run test:mcp-instructions && bun run test:mcp-live-update-onboarding && bun run test:mcp-stdout-guard && bun run test:mcp-platform-select && bun run test:mcp-explain-scopes && bun run test:mcp-oauth-reopen && bun run test:mcp-broker-oauth && bun run test:mcp-broker-session && bun run test:mcp-credentials-manage && bun run test:mcp-resume-prompt && bun run test:mcp-build-job && bun run test:mcp-build-tools && bun run test:app-created-source && bun run test:app-list-output-text && bun run test:doctor-analytics && bun run test:posthog-exception && bun run test:create-supabase-client && bun run test:build-platform-selection && bun run test:builder-project-discovery && bun run test:onboarding-recovery && bun run test:onboarding-progress && bun run test:onboarding-run-targets && bun run test:run-device-command && bun run test:init-monorepo-targeting && bun run test:init-app-conflict && bun run test:channel-add-exists && bun run test:wait-log && bun run test:init-guardrails && bun run test:init-replay && bun run test:init-telemetry && bun run test:prompt-preferences && bun run test:esm-sdk && bun run test:mcp && bun run test:mcp-no-key-handshake && bun run test:auth-session && bun run test:version-detection && bun run test:platform-paths && bun run test:project-type-detection && bun run test:payload-split && bun run test:manifest-path-encoding && bun run test:macos-signing && bun run test:asc-key-protocol && bun run test:apple-api-import-helpers && bun run test:apple-api-verify-key && bun run test:bundle-id-detector && bun run test:apple-api-app-list && bun run test:app-verification && bun run test:pbxproj-parser && bun run test:ai-log-capture && bun run test:ai-analyze-flow && bun run test:cicd-failure-help && bun run test:ai-sse-parser && bun run test:ai-render-markdown && bun run test:ai-stream-markdown && bun run test:ai-onboarding-mode && bun run test:ai-fit && bun run test:platform-layout && bun run test:frame-fit && bun run test:onboarding-min-size && bun run test:min-size-gate && bun run test:shell-size-gate && bun run test:build-log-sanitize && bun run test:build-output-viewport && bun run test:diff-viewer-viewport && bun run test:build-complete-exit && bun run test:ai-analyze-stream && bun run test:support-mailto && bun run test:support-redact && bun run test:support-internal-log && bun run test:support-help-menu && bun run test:support-contact && bun run test:support-upload-prompt && bun run test:support-bundle-files && bun run test:self-update && bun run test:update-prompt && bun run test:apple-api-cert-create && bun run test:android-tail-engine && bun run test:android-tail-render && bun run test:android-tail-routing && bun run test:dev-gate-stripped && bun run test:frame-fit-ios-shared && bun run test:ios-confirm-app-id && bun run test:ios-create-new && bun run test:ios-e2e && bun run test:ios-flow-contract && bun run test:ios-import-discovery && bun run test:ios-import-export && bun run test:ios-import-pickers && bun run test:ios-import-recovery && bun run test:ios-recovery && bun run test:ios-resume && bun run test:ios-tail-handoff && bun run test:ios-tui-render && bun run test:p8-error && bun run test:ios-tui-routing && bun run test:ios-updater-sync-validation && bun run test:ios-verify-app && bun run test:ios-marketing-version && bun run test:android-version && bun run test:platform-flow-contract && bun run test:tail-engine-shared && bun run test:prescan && bun run test:android-reporting-api && bun run test:android-app-verification && bun run test:android-rename && bun run test:appflow-auth && bun run test:appflow-api-map && bun run test:appflow-validate && bun run test:appflow-flow && bun run test:appflow-gapfill && bun run test:appflow-engine && bun run test:appflow-tail && bun run test:appflow-fetch && bun run test:appflow-sa-decode && bun run test:app-permission-helper && bun run test:2fa-compliance-network && bun run test:organization-set-api-host && bun run test:trial-warning && bun run test:plan-validation",
"test:build-platform-selection": "bun test/test-build-platform-selection.mjs",
"test:builder-project-discovery": "bun test/test-builder-project-discovery.mjs",
"test:ai-log-capture": "bun test/test-ai-log-capture.mjs",
Expand Down
98 changes: 95 additions & 3 deletions cli/src/channel/add.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import type { SupabaseClient } from '@supabase/supabase-js'
import type { ChannelAddOptions } from '../schemas/channel'
import type { Database } from '../types/supabase.types'
import { intro, log, outro } from '@clack/prompts'
import { trackEvent } from '../analytics/track'
import { check2FAComplianceForApp, checkAppExistsAndHasPermissionOrgErr } from '../api/app'
import { createChannel } from '../api/channels'
import { createChannel, findChannel } from '../api/channels'
import { isChannelAlreadyExistsError } from '../init/channel-conflict'
import {
createSupabaseClient,
findSavedKey,
Expand All @@ -13,6 +17,52 @@ import {
sendEvent,
} from '../utils'

export async function isChannelReadableByCaller(
supabase: SupabaseClient<Database>,
appId: string,
channelName: string,
): Promise<boolean | null> {
const { data, error } = await findChannel(supabase, appId, channelName)
if (!error && data)
return true

const code = (error as { code?: string } | null)?.code
if (code === 'PGRST116')
return false

return null
}

export type ChannelAddDuplicateOutcome = 'duplicate_readable' | 'duplicate_inaccessible' | 'not_duplicate'

export async function resolveChannelAddDuplicateOutcome(
params: {
createError: unknown
supabase: SupabaseClient<Database>
appId: string
channelName: string
},
deps: {
isChannelReadableByCaller?: typeof isChannelReadableByCaller
} = {},
): Promise<ChannelAddDuplicateOutcome> {
if (!isChannelAlreadyExistsError(params.createError))
return 'not_duplicate'

const readable = await (deps.isChannelReadableByCaller ?? isChannelReadableByCaller)(
params.supabase,
params.appId,
params.channelName,
)

if (readable === true)
return 'duplicate_readable'
if (readable === false)
return 'duplicate_inaccessible'

throw new Error('Cannot verify channel access for this API key. Grant app.read_channels or channel.read, then retry.')
}

export async function addChannelInternal(channelId: string, appId: string, options: ChannelAddOptions, silent = false) {
if (!silent)
intro('Create channel')
Expand Down Expand Up @@ -59,9 +109,51 @@ export async function addChannelInternal(channelId: string, appId: string, optio
})

if (res.error) {
let duplicateOutcome: ChannelAddDuplicateOutcome
try {
duplicateOutcome = await resolveChannelAddDuplicateOutcome({
createError: res.error,
Comment thread
cursor[bot] marked this conversation as resolved.
Resolved
supabase,
appId,
channelName: channelId,
})
}
catch (ownershipError) {
const message = formatError(ownershipError)
if (!silent)
log.error(`Cannot create Channel 🙀\n${message}`)
throw new Error(`Cannot create channel: ${message}`)
}

if (duplicateOutcome === 'duplicate_readable') {
void trackEvent({
channel: 'channel',
event: 'CLI Recovered Channel Already Exists',
appId,
apikey: options.apikey!,
orgId,
tags: { channel: channelId },
})

if (!silent) {
log.success(`Channel ${channelId} already exists ✅`)
outro('Done ✅')
}

return { name: channelId }
}

if (duplicateOutcome === 'duplicate_inaccessible') {
const message = `Channel ${channelId} already exists but is not accessible with this API key`
if (!silent)
log.error(`Cannot create Channel 🙀\n${message}`)
throw new Error(`Cannot create channel: ${message}`)
}

const message = formatError(res.error)
if (!silent)
log.error(`Cannot create Channel 🙀\n${formatError(res.error)}`)
throw new Error(`Cannot create channel: ${formatError(res.error)}`)
log.error(`Cannot create Channel 🙀\n${message}`)
throw new Error(`Cannot create channel: ${message}`)
}

await sendEvent(options.apikey, {
Expand Down
68 changes: 68 additions & 0 deletions cli/test/test-channel-add-exists.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#!/usr/bin/env node
import assert from 'node:assert/strict'
import {
resolveChannelAddDuplicateOutcome,
} from '../src/channel/add.ts'

console.log('🧪 Testing channel add duplicate handling...\n')

const duplicateError = new Error('Cannot create channel: duplicate key value violates unique constraint "unique_name_app_id" | Code: 23505')
const supabase = {}

const readableOutcome = await resolveChannelAddDuplicateOutcome(
{
createError: duplicateError,
supabase,
appId: 'com.example.app',
channelName: 'production',
},
{
isChannelReadableByCaller: async () => true,
},
)
assert.equal(readableOutcome, 'duplicate_readable')

const inaccessibleOutcome = await resolveChannelAddDuplicateOutcome(
{
createError: duplicateError,
supabase,
appId: 'com.example.app',
channelName: 'production',
},
{
isChannelReadableByCaller: async () => false,
},
)
assert.equal(inaccessibleOutcome, 'duplicate_inaccessible')

const otherErrorOutcome = await resolveChannelAddDuplicateOutcome(
{
createError: new Error('Cannot create channel | insufficient_permissions | HTTP 403'),
supabase,
appId: 'com.example.app',
channelName: 'production',
},
{
isChannelReadableByCaller: async () => {
throw new Error('isChannelReadableByCaller should not run for non-duplicate errors')
},
},
)
assert.equal(otherErrorOutcome, 'not_duplicate')

await assert.rejects(
() => resolveChannelAddDuplicateOutcome(
{
createError: duplicateError,
supabase,
appId: 'com.example.app',
channelName: 'production',
},
{
isChannelReadableByCaller: async () => null,
},
),
/Grant app.read_channels or channel.read/,
)

console.log('✅ channel add duplicate handling tests passed')
Loading