@sixb/app 0.2.5 → 0.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (136) hide show
  1. package/dist/agent/components/agent-threads.d.ts.map +1 -1
  2. package/dist/agent/components/composer-place.d.ts.map +1 -1
  3. package/dist/agent/components/computer-place.d.ts +24 -6
  4. package/dist/agent/components/computer-place.d.ts.map +1 -1
  5. package/dist/agent/components/conversation-panel.d.ts.map +1 -1
  6. package/dist/agent/components/message-view.d.ts +13 -3
  7. package/dist/agent/components/message-view.d.ts.map +1 -1
  8. package/dist/agent/components/pending-messages.d.ts.map +1 -1
  9. package/dist/agent/components/sandbox-recovery.d.ts +8 -2
  10. package/dist/agent/components/sandbox-recovery.d.ts.map +1 -1
  11. package/dist/agent/components/transcript.d.ts +13 -0
  12. package/dist/agent/components/transcript.d.ts.map +1 -1
  13. package/dist/agent/conversation.d.ts +4 -0
  14. package/dist/agent/conversation.d.ts.map +1 -1
  15. package/dist/agent/delegation/use-children.d.ts +5 -5
  16. package/dist/agent/delegation/use-children.d.ts.map +1 -1
  17. package/dist/agent/format.d.ts +7 -0
  18. package/dist/agent/format.d.ts.map +1 -1
  19. package/dist/agent/hooks/thread-queries.d.ts +1548 -0
  20. package/dist/agent/hooks/thread-queries.d.ts.map +1 -0
  21. package/dist/agent/hooks/use-agent-conversation.d.ts +41 -2
  22. package/dist/agent/hooks/use-agent-conversation.d.ts.map +1 -1
  23. package/dist/agent/hooks/use-thread-lists.d.ts +80 -3
  24. package/dist/agent/hooks/use-thread-lists.d.ts.map +1 -1
  25. package/dist/agent/hooks/use-thread-place.d.ts +49 -0
  26. package/dist/agent/hooks/use-thread-place.d.ts.map +1 -0
  27. package/dist/agent/i18n/en.d.ts +44 -6
  28. package/dist/agent/i18n/en.d.ts.map +1 -1
  29. package/dist/agent/i18n/fr.d.ts.map +1 -1
  30. package/dist/agent/i18n/index.d.ts +76 -12
  31. package/dist/agent/i18n/index.d.ts.map +1 -1
  32. package/dist/agent/live-run.d.ts.map +1 -1
  33. package/dist/agent/model-selection.d.ts +3 -2
  34. package/dist/agent/model-selection.d.ts.map +1 -1
  35. package/dist/agent/moves.d.ts +40 -0
  36. package/dist/agent/moves.d.ts.map +1 -0
  37. package/dist/agent/thread-reader-state.d.ts +30 -0
  38. package/dist/agent/thread-reader-state.d.ts.map +1 -0
  39. package/dist/agent/types.d.ts +4 -0
  40. package/dist/agent/types.d.ts.map +1 -1
  41. package/dist/artifacts/live/session.d.ts.map +1 -1
  42. package/dist/artifacts/queries.d.ts.map +1 -1
  43. package/dist/artifacts/renderers/live-frame.d.ts.map +1 -1
  44. package/dist/{chunk-69qgh20f.js → chunk-1f4h75n3.js} +1 -1
  45. package/dist/{chunk-4fex83k2.js → chunk-7v9622qb.js} +2254 -739
  46. package/dist/{chunk-4fex83k2.js.map → chunk-7v9622qb.js.map} +29 -26
  47. package/dist/{chunk-5sgac68y.js → chunk-dntecmwb.js} +1 -1
  48. package/dist/{chunk-4wm09prf.js → chunk-qmka6aea.js} +1 -1
  49. package/dist/createCustomApp.d.ts +8 -1
  50. package/dist/createCustomApp.d.ts.map +1 -1
  51. package/dist/index.d.ts +3 -2
  52. package/dist/index.d.ts.map +1 -1
  53. package/dist/index.js +4 -2
  54. package/dist/index.js.map +3 -3
  55. package/dist/pages/console/data/accounts.d.ts +94 -0
  56. package/dist/pages/console/data/accounts.d.ts.map +1 -0
  57. package/dist/pages/console/data/connectors.d.ts.map +1 -1
  58. package/dist/pages/console/data/datasets.d.ts.map +1 -1
  59. package/dist/pages/console/data/live-updates.d.ts.map +1 -1
  60. package/dist/pages/console/data/messages.d.ts +46 -0
  61. package/dist/pages/console/data/messages.d.ts.map +1 -1
  62. package/dist/pages/console/data/pipelines.d.ts.map +1 -1
  63. package/dist/pages/console/data/projections.d.ts.map +1 -1
  64. package/dist/pages/console/data/sync-button.d.ts.map +1 -1
  65. package/dist/pages/console/data/syncs.d.ts.map +1 -1
  66. package/dist/pages/console/ontology/actions.d.ts.map +1 -1
  67. package/dist/pages/console/ontology/object-type.d.ts.map +1 -1
  68. package/dist/pages/console/ontology/object-types.d.ts.map +1 -1
  69. package/dist/pages/console/ontology/rules.d.ts.map +1 -1
  70. package/dist/pages/console/ontology/workflow.d.ts.map +1 -1
  71. package/dist/pages/console/ontology/workflows.d.ts.map +1 -1
  72. package/dist/pages/folders.d.ts +106 -0
  73. package/dist/pages/folders.d.ts.map +1 -0
  74. package/dist/pages/settings/usage/breakdown.d.ts.map +1 -1
  75. package/dist/pages/settings/usage/page.d.ts +4 -1
  76. package/dist/pages/settings/usage/page.d.ts.map +1 -1
  77. package/dist/pages/settings/usage/spend-model.d.ts +43 -19
  78. package/dist/pages/settings/usage/spend-model.d.ts.map +1 -1
  79. package/dist/pages.js +23453 -22656
  80. package/dist/pages.js.map +23 -21
  81. package/dist/server.d.ts +1 -1
  82. package/dist/server.d.ts.map +1 -1
  83. package/dist/server.js +40 -3
  84. package/dist/server.js.map +3 -3
  85. package/package.json +3 -3
  86. package/src/agent/agent-chat.tsx +2 -2
  87. package/src/agent/components/agent-threads.tsx +42 -2
  88. package/src/agent/components/composer-place.tsx +2 -7
  89. package/src/agent/components/computer-place.tsx +415 -70
  90. package/src/agent/components/conversation-panel.tsx +31 -26
  91. package/src/agent/components/message-view.tsx +418 -9
  92. package/src/agent/components/pending-messages.tsx +5 -1
  93. package/src/agent/components/sandbox-recovery.tsx +24 -6
  94. package/src/agent/components/transcript.tsx +136 -5
  95. package/src/agent/conversation.ts +16 -1
  96. package/src/agent/format.ts +52 -0
  97. package/src/agent/hooks/thread-queries.ts +75 -0
  98. package/src/agent/hooks/use-agent-conversation.ts +461 -112
  99. package/src/agent/hooks/use-thread-lists.ts +72 -7
  100. package/src/agent/hooks/use-thread-place.ts +239 -0
  101. package/src/agent/i18n/en.ts +69 -16
  102. package/src/agent/i18n/fr.ts +71 -19
  103. package/src/agent/live-run.ts +38 -0
  104. package/src/agent/model-selection.ts +3 -2
  105. package/src/agent/moves.ts +174 -0
  106. package/src/agent/thread-reader-state.ts +75 -0
  107. package/src/agent/types.ts +6 -0
  108. package/src/artifacts/live/session.ts +5 -0
  109. package/src/createCustomApp.ts +57 -3
  110. package/src/index.ts +4 -0
  111. package/src/pages/console/data/accounts.tsx +509 -0
  112. package/src/pages/console/data/connectors.tsx +67 -64
  113. package/src/pages/console/data/datasets.tsx +79 -68
  114. package/src/pages/console/data/live-updates.ts +2 -0
  115. package/src/pages/console/data/messages.ts +73 -0
  116. package/src/pages/console/data/pipelines.tsx +80 -69
  117. package/src/pages/console/data/projections.tsx +111 -82
  118. package/src/pages/console/data/sync-button.tsx +56 -16
  119. package/src/pages/console/data/syncs.tsx +121 -86
  120. package/src/pages/console/ontology/actions.tsx +51 -24
  121. package/src/pages/console/ontology/object-type.tsx +5 -1
  122. package/src/pages/console/ontology/object-types.tsx +41 -32
  123. package/src/pages/console/ontology/rules.tsx +48 -38
  124. package/src/pages/console/ontology/workflow.tsx +9 -3
  125. package/src/pages/console/ontology/workflows.tsx +55 -67
  126. package/src/pages/folders.tsx +335 -0
  127. package/src/pages/section-ui.tsx +1 -1
  128. package/src/pages/settings/usage/breakdown.tsx +5 -2
  129. package/src/pages/settings/usage/filter-menu.tsx +1 -1
  130. package/src/pages/settings/usage/page.tsx +32 -13
  131. package/src/pages/settings/usage/spend-chart.tsx +2 -2
  132. package/src/pages/settings/usage/spend-model.ts +118 -50
  133. package/src/server.ts +1 -0
  134. /package/dist/{chunk-69qgh20f.js.map → chunk-1f4h75n3.js.map} +0 -0
  135. /package/dist/{chunk-5sgac68y.js.map → chunk-dntecmwb.js.map} +0 -0
  136. /package/dist/{chunk-4wm09prf.js.map → chunk-qmka6aea.js.map} +0 -0
@@ -1,7 +1,20 @@
1
- import { listAgentApprovalsOptions, listAgentThreadsInfiniteOptions } from "@sixb/client/hooks"
2
- import { useInfiniteQuery, useQuery } from "@tanstack/react-query"
1
+ import {
2
+ getAgentThreadQueryKey,
3
+ listAgentApprovalsOptions,
4
+ listAgentThreadsInfiniteOptions,
5
+ listAgentThreadsQueryKey,
6
+ markAgentThreadReadMutation,
7
+ } from "@sixb/client/hooks"
8
+ import {
9
+ type InfiniteData,
10
+ useInfiniteQuery,
11
+ useMutation,
12
+ useQuery,
13
+ useQueryClient,
14
+ } from "@tanstack/react-query"
3
15
  import { useMemo } from "react"
4
16
  import { THREAD_PAGE_SIZE } from "../thread-navigation"
17
+ import type { AgentThread, AgentThreadRead } from "../types"
5
18
 
6
19
  const THREAD_LIST_QUERY = {
7
20
  limit: String(THREAD_PAGE_SIZE),
@@ -18,15 +31,22 @@ const SHARED_THREAD_LIST_QUERY = {
18
31
  /** The calls waiting for the reader across threads, for the thread list. */
19
32
  const PENDING_APPROVALS_QUERY = { status: "pending" as const, limit: "200" }
20
33
 
34
+ type ThreadListPage = { readonly threads: AgentThread[] }
35
+
36
+ /** A thread list as the cache holds it: the paged list this hook reads, or a single page. */
37
+ type ThreadListData = InfiniteData<ThreadListPage> | ThreadListPage
38
+
21
39
  /**
22
40
  * The reader's threads, the ones shared with them, and those where a call waits for them: what a
23
41
  * thread's header counts and the threads page lists. One read for both, so opening the page from a
24
42
  * thread shows what the thread already had.
25
43
  */
26
- export function useAgentThreadLists(options: {
27
- /** How often to read again while nothing announces changes; off by default. */
28
- readonly refetchInterval?: number | false
29
- }) {
44
+ export function useAgentThreadLists(
45
+ options: {
46
+ /** How often to read again while nothing announces changes; off by default. */
47
+ readonly refetchInterval?: number | false
48
+ } = {}
49
+ ) {
30
50
  const refetchInterval = options.refetchInterval ?? false
31
51
  const threadsQuery = useInfiniteQuery({
32
52
  ...listAgentThreadsInfiniteOptions({ query: THREAD_LIST_QUERY }),
@@ -47,6 +67,8 @@ export function useAgentThreadLists(options: {
47
67
  refetchInterval,
48
68
  retry: false,
49
69
  })
70
+ const queryClient = useQueryClient()
71
+ const markRead = useMutation(markAgentThreadReadMutation())
50
72
 
51
73
  const threads = useMemo(
52
74
  () => threadsQuery.data?.pages.flatMap((page) => page.threads) ?? [],
@@ -65,7 +87,50 @@ export function useAgentThreadLists(options: {
65
87
  [pendingApprovalsQuery.data]
66
88
  )
67
89
 
68
- return { threadsQuery, sharedThreadsQuery, threads, sharedThreads, waitingThreadIds }
90
+ /**
91
+ * Record the reader's place in a thread, or its newest when no message is given, which is what
92
+ * Done sends. The answer is the state it produced, so the caches take it without a refetch.
93
+ */
94
+ const markThreadRead = async (
95
+ threadId: string,
96
+ input: { readonly throughMessageId?: string } = {}
97
+ ): Promise<AgentThreadRead> => {
98
+ const { read } = await markRead.mutateAsync({
99
+ path: { threadId },
100
+ body:
101
+ input.throughMessageId === undefined ? {} : { throughMessageId: input.throughMessageId },
102
+ })
103
+
104
+ const withRead = (thread: AgentThread) =>
105
+ thread.id === read.threadId ? { ...thread, read } : thread
106
+
107
+ // The key matches every thread list, paged or not: a custom app may hold either.
108
+ queryClient.setQueriesData<ThreadListData>({ queryKey: listAgentThreadsQueryKey() }, (data) => {
109
+ if (!data) return data
110
+ if ("pages" in data) {
111
+ return {
112
+ ...data,
113
+ pages: data.pages.map((page) => ({ ...page, threads: page.threads.map(withRead) })),
114
+ }
115
+ }
116
+ return { ...data, threads: data.threads.map(withRead) }
117
+ })
118
+ queryClient.setQueryData<AgentThread>(
119
+ getAgentThreadQueryKey({ path: { threadId } }),
120
+ (thread) => (thread ? { ...thread, read } : thread)
121
+ )
122
+
123
+ return read
124
+ }
125
+
126
+ return {
127
+ threadsQuery,
128
+ sharedThreadsQuery,
129
+ threads,
130
+ sharedThreads,
131
+ waitingThreadIds,
132
+ markThreadRead,
133
+ }
69
134
  }
70
135
 
71
136
  /** The page after those read so far, while the server says there are more. */
@@ -0,0 +1,239 @@
1
+ import { isSixbApiError } from "@sixb/client"
2
+ import {
3
+ type DesktopComputer,
4
+ type DesktopComputerAccess,
5
+ getAgentThreadQueryKey,
6
+ listAgentComputersOptions,
7
+ listAgentThreadRunsQueryKey,
8
+ listAgentThreadsQueryKey,
9
+ moveAgentThreadToCloudMutation,
10
+ moveAgentThreadToComputerMutation,
11
+ useDesktop,
12
+ } from "@sixb/client/hooks"
13
+ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
14
+ import { useCallback, useState } from "react"
15
+ import type { ThreadComputer } from "../components/computer-place"
16
+ import type { ThreadAccess } from "../sharing"
17
+ import type { AgentThread } from "../types"
18
+ import type { PlaceComputer } from "./use-new-thread-place"
19
+
20
+ export type ThreadPlaceBusy = "running" | "approval" | null
21
+
22
+ export interface ThreadPlace {
23
+ readonly open: boolean
24
+ readonly setOpen: (open: boolean) => void
25
+ readonly onComputer: boolean
26
+ readonly currentComputer: ThreadComputer | null
27
+ readonly computers: readonly PlaceComputer[]
28
+ readonly loading: boolean
29
+ readonly pending: boolean
30
+ /** Where the move on its way goes: the cloud, or a folder on one of its owner's computers. */
31
+ readonly movingTo: "cloud" | { readonly computerId: string; readonly folder: string } | null
32
+ /** What keeps it where it runs: a reply in progress, or one waiting for approval. */
33
+ readonly busy: ThreadPlaceBusy
34
+ readonly error: "busy" | "failed" | null
35
+ /** The last move to the cloud's error alone, for the notice that offers it. */
36
+ readonly cloudError: "busy" | "failed" | null
37
+ /** To the cloud: at once, or after asking when a message waits, as it would then run there. */
38
+ readonly moveToCloud: () => void
39
+ /** The question asked before a waiting message goes to the cloud. */
40
+ readonly confirmCloud: {
41
+ readonly open: boolean
42
+ readonly setOpen: (open: boolean) => void
43
+ readonly accept: () => void
44
+ }
45
+ readonly moveToFolder: (computer: PlaceComputer, folder: string) => void
46
+ readonly pickFolder?: () => Promise<void>
47
+ readonly forgetFolder?: (folder: string) => void
48
+ }
49
+
50
+ /**
51
+ * Where an existing conversation runs, for its owner: switch between the cloud and any connected
52
+ * computer or folder as needed. Null where there is nothing to choose, as for a new conversation:
53
+ * in a browser, a cloud conversation that never moved, while none of its owner's computers is
54
+ * connected.
55
+ */
56
+ export function useThreadPlace(input: {
57
+ readonly thread: AgentThread | null
58
+ readonly access: ThreadAccess
59
+ readonly busy: ThreadPlaceBusy
60
+ /** A message waits for the computer: moving to the cloud runs it there. */
61
+ readonly waiting: boolean
62
+ }): ThreadPlace | null {
63
+ const { thread, access, busy, waiting } = input
64
+ const active = thread !== null && access === "owner"
65
+ const threadId = thread?.id ?? null
66
+ const queryClient = useQueryClient()
67
+ const desktopAccess: DesktopComputerAccess | null = useDesktop()?.computer ?? null
68
+
69
+ // Which conversation the menu is open on: navigating away closes it, without an effect.
70
+ const [openFor, setOpenFor] = useState<string | null>(null)
71
+ // Which conversation the question before the cloud is asked on.
72
+ const [confirmingFor, setConfirmingFor] = useState<string | null>(null)
73
+ const [desktopComputer, setDesktopComputer] = useState<DesktopComputer | null>(null)
74
+ const [desktopFolders, setDesktopFolders] = useState<readonly string[]>([])
75
+
76
+ const toComputer = useMutation(moveAgentThreadToComputerMutation())
77
+ const toCloud = useMutation(moveAgentThreadToCloudMutation())
78
+
79
+ const refreshDesktop = useCallback(() => {
80
+ if (!desktopAccess) return
81
+ void desktopAccess.about().then(setDesktopComputer, () => {})
82
+ void desktopAccess.folders().then(setDesktopFolders, () => {})
83
+ }, [desktopAccess])
84
+
85
+ const open = threadId !== null && openFor === threadId
86
+ // Opening it starts from no error, and reads Sixb Desktop's folders again.
87
+ const setOpen = (next: boolean) => {
88
+ if (next) {
89
+ toComputer.reset()
90
+ toCloud.reset()
91
+ refreshDesktop()
92
+ }
93
+ setOpenFor(next ? threadId : null)
94
+ }
95
+
96
+ // In a browser, a cloud conversation needs the list to know whether there's a choice at all: the
97
+ // one a new conversation's picker reads, which the activity feed keeps current. A computer's
98
+ // conversation always shows where it runs, and reads the list once its menu opens.
99
+ const browser = desktopAccess === null
100
+ const onComputer = thread?.runsOn === "computer"
101
+ const listed = useQuery({
102
+ ...listAgentComputersOptions(),
103
+ enabled: active && browser && (open || !onComputer),
104
+ })
105
+
106
+ if (!active || !thread) return null
107
+
108
+ const computers: readonly PlaceComputer[] = desktopAccess
109
+ ? desktopComputer
110
+ ? [{ id: desktopComputer.id, name: desktopComputer.name, folders: desktopFolders }]
111
+ : []
112
+ : (listed.data?.computers ?? [])
113
+
114
+ // Open, it stays until closed: a computer that goes away meanwhile leaves the cloud to choose.
115
+ // One that ran on a computer keeps it, so the way back stays where its owner last used it.
116
+ const nothingToChoose =
117
+ browser && !onComputer && !open && computers.length === 0 && thread.movedAt === undefined
118
+ if (nothingToChoose) return null
119
+
120
+ const currentComputer = thread.computer ?? null
121
+
122
+ const computerPending = toComputer.isPending && toComputer.variables?.path.threadId === thread.id
123
+ const cloudPending = toCloud.isPending && toCloud.variables?.path.threadId === thread.id
124
+ const pending = computerPending || cloudPending
125
+ const movingTo = cloudPending
126
+ ? ("cloud" as const)
127
+ : computerPending && toComputer.variables
128
+ ? {
129
+ computerId: toComputer.variables.body.computer.id,
130
+ folder: toComputer.variables.body.computer.folder,
131
+ }
132
+ : null
133
+
134
+ const computerError =
135
+ toComputer.isError && toComputer.variables?.path.threadId === thread.id
136
+ ? toComputer.error
137
+ : null
138
+ const cloudError =
139
+ toCloud.isError && toCloud.variables?.path.threadId === thread.id ? toCloud.error : null
140
+ const error = moveError(computerError ?? cloudError)
141
+
142
+ const applyMoved = (moved: AgentThread) => {
143
+ queryClient.setQueryData(getAgentThreadQueryKey({ path: { threadId: moved.id } }), moved)
144
+ void queryClient.invalidateQueries({
145
+ queryKey: listAgentThreadRunsQueryKey({ path: { threadId: moved.id } }),
146
+ })
147
+ void queryClient.invalidateQueries({ queryKey: listAgentThreadsQueryKey() })
148
+ setOpenFor(null)
149
+ }
150
+
151
+ const runInCloud = () => {
152
+ if (pending || busy) return
153
+ toCloud.mutate({ path: { threadId: thread.id } }, { onSuccess: applyMoved })
154
+ }
155
+
156
+ const moveToCloud = () => {
157
+ if (!onComputer) {
158
+ setOpenFor(null)
159
+ return
160
+ }
161
+ if (pending || busy) return
162
+
163
+ // The marker says what moved. A waiting message runs apart from its folder's files: ask first.
164
+ if (waiting) {
165
+ setOpenFor(null)
166
+ setConfirmingFor(thread.id)
167
+ return
168
+ }
169
+ runInCloud()
170
+ }
171
+
172
+ const confirmCloud = {
173
+ open: confirmingFor === thread.id,
174
+ setOpen: (next: boolean) => setConfirmingFor(next ? thread.id : null),
175
+ accept: () => {
176
+ setConfirmingFor(null)
177
+ runInCloud()
178
+ },
179
+ }
180
+
181
+ const moveToFolder = (computer: PlaceComputer, folder: string) => {
182
+ if (!computer.id || !computer.name) return
183
+ if (onComputer && currentComputer?.id === computer.id && currentComputer.folder === folder) {
184
+ setOpenFor(null)
185
+ return
186
+ }
187
+ if (pending || busy) return
188
+ toComputer.mutate(
189
+ {
190
+ path: { threadId: thread.id },
191
+ body: { computer: { id: computer.id, name: computer.name, folder } },
192
+ },
193
+ { onSuccess: applyMoved }
194
+ )
195
+ }
196
+
197
+ const pickFolder = desktopAccess
198
+ ? async () => {
199
+ if (pending || busy) return
200
+ const folder = await desktopAccess.pickFolder()
201
+ if (!folder) return
202
+ const found = desktopComputer ?? (await desktopAccess.about().catch(() => null))
203
+ refreshDesktop()
204
+ if (!found) return
205
+ moveToFolder({ id: found.id, name: found.name, folders: desktopFolders }, folder)
206
+ }
207
+ : undefined
208
+
209
+ const forgetFolder = desktopAccess
210
+ ? (folder: string) => {
211
+ void desktopAccess.forgetFolder(folder).then(refreshDesktop, () => {})
212
+ }
213
+ : undefined
214
+
215
+ return {
216
+ open,
217
+ setOpen,
218
+ onComputer,
219
+ currentComputer,
220
+ computers,
221
+ loading: browser && open && listed.isPending,
222
+ pending,
223
+ movingTo,
224
+ busy,
225
+ error,
226
+ cloudError: moveError(cloudError),
227
+ moveToCloud,
228
+ confirmCloud,
229
+ moveToFolder,
230
+ ...(pickFolder ? { pickFolder } : {}),
231
+ ...(forgetFolder ? { forgetFolder } : {}),
232
+ }
233
+ }
234
+
235
+ /** Why a move failed: a turn it must wait for, or anything else. */
236
+ function moveError(error: unknown): "busy" | "failed" | null {
237
+ if (error === null) return null
238
+ return isSixbApiError(error) && error.code === "active_run_exists" ? "busy" : "failed"
239
+ }
@@ -48,6 +48,9 @@ export const en = {
48
48
  threadsLoadFailed: "Could not load threads.",
49
49
  sharedThreadsLoadFailed: "Could not load the threads shared with you.",
50
50
  sendFailed: "Couldn't send your message. Please try again.",
51
+ editFailed: "Couldn't edit your message. Please try again.",
52
+ editBusy: "An answer is still in progress. Stop it, then save your edit.",
53
+ editBusyOther: "Someone else's answer is in progress. Save your edit when it finishes.",
51
54
  busy: "An answer is already in progress. Send yours when it finishes.",
52
55
  busyOther: "Someone else's message is being answered. Send yours when it finishes.",
53
56
  sandboxUnavailable: "Choose how the agent goes on before sending another message.",
@@ -261,6 +264,12 @@ export const en = {
261
264
  ago: (time: string) => `${time} ago`,
262
265
  },
263
266
  transcript: {
267
+ editMessage: "Edit message",
268
+ copyMessage: "Copy message",
269
+ copiedMessage: "Copied",
270
+ editInfo: "Editing this message restarts the conversation from here.",
271
+ cancelEdit: "Cancel",
272
+ saveEdit: "Save",
264
273
  condensed: "Condensed conversation",
265
274
  condensing: "Condensing earlier conversation…",
266
275
  condensingLabel: "Agent is condensing earlier conversation",
@@ -296,6 +305,7 @@ export const en = {
296
305
  "I reached the step limit before producing a final answer. Ask me to continue and I can use the work above as context.",
297
306
  output_limit_reached:
298
307
  "I ran out of room before finishing this answer. Ask me to continue, or lower the reasoning level.",
308
+ workspace_not_saved: "The files couldn’t be saved when this response ended.",
299
309
  unknown: "Something went wrong during this response.",
300
310
  } satisfies Record<AgentRunDiagnosticCode | "unknown", string>,
301
311
  activity: {
@@ -926,6 +936,11 @@ export const en = {
926
936
  resumeHint: "Its files are kept, but its last change may be unfinished.",
927
937
  resumeFailed:
928
938
  "Couldn't pick up where it left off. Reload the page and try again, or start over without the files.",
939
+ answeredTitle: "What to do with the files",
940
+ answeredDescription:
941
+ "The answer above is complete. Go on with the files as they are, or start over without them.",
942
+ keepFiles: "Go on with these files",
943
+ keepingFiles: "Going on…",
929
944
  },
930
945
  /** A command the agent runs in the background, as its card and its calls read. */
931
946
  background: {
@@ -959,36 +974,74 @@ export const en = {
959
974
  },
960
975
  /** A conversation that runs on its owner's computer, as its owner sees it. */
961
976
  computer: {
962
- online: "Connected",
963
- offline: "Not connected",
964
- offlineNotice: (computer: string, folder: string) =>
965
- `${computer} is offline. Your message waits until ${folder} is connected there.`,
977
+ online: "available",
978
+ offline: "not available",
979
+ /** Its folder isn't open on its computer: nothing waits for it. */
980
+ folderUnavailable: (folder: string, computer: string) =>
981
+ `${folder} isn't available on ${computer} right now. Open Sixb there to continue, or continue in the cloud.`,
982
+ /** Its folder isn't open on its computer, and a message waits for it. */
983
+ messageWaiting: (folder: string, computer: string) =>
984
+ `Your message is waiting for ${folder} on ${computer}. Open Sixb there, or continue in the cloud.`,
966
985
  noFolder:
967
- "This conversation has no folder yet. Open sixb in its folder and press ctrl+f, or continue in the cloud.",
986
+ "This conversation has no folder yet. Choose one from the menu at the top, or continue in the cloud.",
968
987
  /** In a desktop app, about a conversation of this computer's. */
969
988
  offlineHere: (folder: string) =>
970
- `Not running here yet. Your message waits until this computer is connected in ${folder}.`,
971
- runHere: "Run on this computer",
989
+ `Messages from the app don't run in ${folder} on this computer yet.`,
990
+ runHere: "Run them here",
972
991
  waitingFor: (computer: string) => `Waiting for ${computer}`,
973
992
  /** Where a new conversation runs, in a desktop app. */
974
993
  placeTitle: "Where this conversation runs",
975
- placeChip: (place: string) => `Runs in ${place}. Change where it runs`,
994
+ placeChip: (place: string, status: string | null) =>
995
+ `Runs in ${place}${status ? `, ${status}` : ""}. Change where it runs`,
996
+ noFolderChip: "No folder yet. Choose where this conversation runs",
976
997
  cloud: "Cloud",
998
+ cloudDescription: "Runs even when your computers are off",
999
+ thisComputer: "This computer",
1000
+ checkingComputers: "Checking connected computers…",
1001
+ noComputers:
1002
+ "None of your computers is connected. Open Sixb on one to move this conversation there.",
1003
+ offlineLabel: "Offline",
1004
+ offlineMenuHint: "Not available right now. Messages wait for it, or choose another place.",
977
1005
  chooseFolder: "Choose a folder…",
978
1006
  chooseFolderShort: "Choose a folder",
979
1007
  forgetFolder: (folder: string) => `Stop running messages in ${folder}`,
980
1008
  continueInCloud: "Continue in the cloud",
981
1009
  moving: "Moving…",
982
1010
  moveFailed: "Could not move it to the cloud. Try again.",
983
- moveBusy: "A turn is running or waiting for your approval. Stop or answer it first.",
984
- confirmTitle: "Continue in the cloud?",
985
- confirmDescription:
986
- "This conversation will run in the cloud from now on, including any waiting message. Its folder's files stay on your computer, and it can't move back.",
1011
+ moveSwitchFailed: "Could not switch where this conversation runs. Try again.",
1012
+ moveBusy:
1013
+ "A reply is in progress or waiting for approval. Stop it or answer the request, then try again.",
1014
+ moveWhileRunning: "A reply is in progress. Stop it or let it finish to move this conversation.",
1015
+ moveWhileApproval:
1016
+ "A request is waiting for approval. You can move this conversation once it's decided.",
1017
+ confirmTitle: "Run your waiting message in the cloud?",
1018
+ confirmDescription: (folder: string | null) =>
1019
+ folder
1020
+ ? `In the cloud, the agent won't see the files in ${folder}. You can move the conversation back once ${folder} is available again.`
1021
+ : "In the cloud, the agent won't see the computer's files. You can move the conversation back once it's available again.",
1022
+ confirmAction: "Run in the cloud",
987
1023
  cancel: "Cancel",
988
- movedToCloud: "Moved to the cloud. Files from before stayed on the computer.",
989
- movedToFolder: (folder: string) =>
990
- `Moved to ${folder}. Files from before stayed where they were.`,
991
- movedElsewhere: "Moved to another folder. Files from before stayed where they were.",
1024
+ /** A folder on a computer, in running text. */
1025
+ placeOn: (folder: string, computer: string) => `${folder} on ${computer}`,
1026
+ cloudPlace: "the cloud",
1027
+ movedToCloud: (from: string | null) =>
1028
+ from
1029
+ ? `Moved to the cloud. The files in ${from} stay behind.`
1030
+ : "Moved to the cloud. The computer's files stay behind.",
1031
+ movedToFolder: (place: string) => `Moved to ${place}. The cloud's files stay behind.`,
1032
+ /** For someone the conversation is shared with, who isn't shown its folders. */
1033
+ movedToComputer: (owner: string | null) =>
1034
+ `Moved to ${owner ? `${owner}'s computer` : "the computer"}. The cloud's files stay behind.`,
1035
+ movedBetweenFolders: (folder: string, from: string) =>
1036
+ `Moved from ${from} to ${folder}. The files in ${from} stay behind.`,
1037
+ movedElsewhere: (place: string | null) =>
1038
+ `Moved to ${place ?? "another folder"}. Earlier files stay where they were.`,
1039
+ /** A fork's first turn, in a workspace of its own. */
1040
+ continuedIn: (place: string) =>
1041
+ `Continued in ${place}. The original conversation's files stay with it.`,
1042
+ /** A fork's first turn on a computer whose folder the reader isn't shown. */
1043
+ continuedOnComputer: (owner: string | null) =>
1044
+ `Continued on ${owner ? `${owner}'s computer` : "the computer"}. The original conversation's files stay with it.`,
992
1045
  },
993
1046
  /** A conversation its owner shares with other users of the project. */
994
1047
  sharing: {
@@ -5,6 +5,9 @@ const number = (value: number) => value.toLocaleString("fr")
5
5
  const count = (value: number, one: string, many = `${one}s`) =>
6
6
  `${number(value)} ${plural("fr", value, { one, other: many })}`
7
7
  const quoted = (name: string) => `« ${name} »`
8
+ /** « de » before a name, elided before a vowel: l’ordinateur d’Anthony, de Bob. */
9
+ const ofName = (name: string) =>
10
+ /^[aeiouyàâäæéèêëîïôöœùûü]/i.test(name) ? `d’${name}` : `de ${name}`
8
11
 
9
12
  function lowercaseFirst(value: string): string {
10
13
  return value ? `${value[0]?.toLowerCase()}${value.slice(1)}` : value
@@ -39,6 +42,10 @@ export const fr: Translation<AgentMessages> = {
39
42
  threadsLoadFailed: "Impossible de charger les fils.",
40
43
  sharedThreadsLoadFailed: "Impossible de charger les fils partagés avec vous.",
41
44
  sendFailed: "Le message n’a pas pu être envoyé. Réessayez.",
45
+ editFailed: "Impossible de modifier ce message. Réessayez.",
46
+ editBusy: "Une réponse est encore en cours. Arrêtez-la, puis enregistrez votre modification.",
47
+ editBusyOther:
48
+ "Une réponse demandée par quelqu’un d’autre est en cours. Enregistrez votre modification quand elle sera terminée.",
42
49
  busy: "Une réponse est déjà en cours. Envoyez votre message quand elle sera terminée.",
43
50
  busyOther:
44
51
  "L’agent répond au message de quelqu’un d’autre. Envoyez le vôtre quand il aura fini.",
@@ -247,6 +254,12 @@ export const fr: Translation<AgentMessages> = {
247
254
  ago: (time) => `il y a ${time}`,
248
255
  },
249
256
  transcript: {
257
+ editMessage: "Modifier le message",
258
+ copyMessage: "Copier le message",
259
+ copiedMessage: "Copié",
260
+ editInfo: "Modifier ce message reprend la conversation à partir d’ici.",
261
+ cancelEdit: "Annuler",
262
+ saveEdit: "Enregistrer",
250
263
  condensed: "Conversation condensée",
251
264
  condensing: "Condensation de la conversation précédente…",
252
265
  condensingLabel: "L’agent condense la conversation précédente",
@@ -278,6 +291,7 @@ export const fr: Translation<AgentMessages> = {
278
291
  "J’ai atteint la limite d’étapes avant de produire une réponse finale. Il suffit de me demander de continuer pour reprendre ce travail.",
279
292
  output_limit_reached:
280
293
  "J’ai manqué de place pour terminer cette réponse. Il suffit de me demander de continuer, ou de baisser le niveau de raisonnement.",
294
+ workspace_not_saved: "Les fichiers n’ont pas pu être enregistrés à la fin de cette réponse.",
281
295
  unknown: "Un problème est survenu pendant cette réponse.",
282
296
  },
283
297
  activity: {
@@ -960,6 +974,11 @@ export const fr: Translation<AgentMessages> = {
960
974
  resumeHint: "Ses fichiers sont conservés, mais sa dernière modification peut être inachevée.",
961
975
  resumeFailed:
962
976
  "Impossible de reprendre où il s’était arrêté. Rechargez la page et réessayez, ou repartez sans les fichiers.",
977
+ answeredTitle: "Que faire des fichiers",
978
+ answeredDescription:
979
+ "La réponse ci-dessus est complète. Continuez avec les fichiers tels quels, ou repartez sans eux.",
980
+ keepFiles: "Continuer avec ces fichiers",
981
+ keepingFiles: "Reprise…",
963
982
  },
964
983
  background: {
965
984
  card: (command) => `Commande en arrière-plan : ${command}`,
@@ -1000,18 +1019,30 @@ export const fr: Translation<AgentMessages> = {
1000
1019
  },
1001
1020
  },
1002
1021
  computer: {
1003
- online: "Connecté",
1004
- offline: "Non connecté",
1005
- offlineNotice: (computer, folder) =>
1006
- `${computer} est hors ligne. Votre message attendra que ${folder} y soit connecté.`,
1022
+ online: "disponible",
1023
+ offline: "indisponible",
1024
+ folderUnavailable: (folder, computer) =>
1025
+ `${folder} n’est pas disponible sur ${computer} pour le moment. Ouvrez Sixb dessus pour continuer, ou continuez dans le cloud.`,
1026
+ messageWaiting: (folder, computer) =>
1027
+ `Votre message attend ${folder} sur ${computer}. Ouvrez Sixb dessus, ou continuez dans le cloud.`,
1007
1028
  noFolder:
1008
- "Cette conversation n’a pas encore de dossier. Ouvrez sixb dans son dossier et appuyez sur ctrl+f, ou continuez dans le cloud.",
1029
+ "Cette conversation n’a pas encore de dossier. Choisissez-en un dans le menu en haut, ou continuez dans le cloud.",
1009
1030
  offlineHere: (folder) =>
1010
- `Pas encore en cours ici. Votre message attendra que cet ordinateur soit connecté dans ${folder}.`,
1011
- runHere: "Exécuter sur cet ordinateur",
1012
- placeTitle: "Où cette conversation s'exécute",
1013
- placeChip: (place) => `S'exécute dans ${place}. Changer l'emplacement`,
1031
+ `Les messages de l’app ne s’exécutent pas encore dans ${folder} sur cet ordinateur.`,
1032
+ runHere: "Les exécuter ici",
1033
+ placeTitle: "Où cette conversation s’exécute",
1034
+ placeChip: (place, status) =>
1035
+ `S’exécute dans ${place}${status ? `, ${status}` : ""}. Changer l’emplacement`,
1036
+ noFolderChip: "Pas encore de dossier. Choisir où cette conversation s’exécute",
1014
1037
  cloud: "Cloud",
1038
+ cloudDescription: "Tourne même quand vos ordinateurs sont éteints",
1039
+ thisComputer: "Cet ordinateur",
1040
+ checkingComputers: "Recherche d’ordinateurs connectés…",
1041
+ noComputers:
1042
+ "Aucun de vos ordinateurs n’est connecté. Ouvrez Sixb sur l’un d’eux pour y déplacer cette conversation.",
1043
+ offlineLabel: "Hors ligne",
1044
+ offlineMenuHint:
1045
+ "Indisponible pour le moment. Les messages l’attendent, ou choisissez un autre emplacement.",
1015
1046
  chooseFolder: "Choisir un dossier…",
1016
1047
  chooseFolderShort: "Choisir un dossier",
1017
1048
  forgetFolder: (folder) => `Ne plus exécuter les messages dans ${folder}`,
@@ -1019,16 +1050,37 @@ export const fr: Translation<AgentMessages> = {
1019
1050
  continueInCloud: "Continuer dans le cloud",
1020
1051
  moving: "Déplacement…",
1021
1052
  moveFailed: "Impossible de la déplacer vers le cloud. Réessayez.",
1022
- moveBusy: "Un tour est en cours ou attend votre approbation. Arrêtez-le ou répondez d’abord.",
1023
- confirmTitle: "Continuer dans le cloud ?",
1024
- confirmDescription:
1025
- "Cette conversation s’exécutera désormais dans le cloud, y compris le message en attente. Les fichiers de son dossier restent sur votre ordinateur, et elle ne pourra pas revenir.",
1053
+ moveSwitchFailed: "Impossible de changer où cette conversation s’exécute. Réessayez.",
1054
+ moveBusy:
1055
+ "Une réponse est en cours ou attend une approbation. Arrêtez-la ou répondez à la demande, puis réessayez.",
1056
+ moveWhileRunning:
1057
+ "Une réponse est en cours. Arrêtez-la ou laissez-la se terminer pour déplacer cette conversation.",
1058
+ moveWhileApproval:
1059
+ "Une demande attend une approbation. Vous pourrez déplacer cette conversation une fois la demande décidée.",
1060
+ confirmTitle: "Exécuter votre message en attente dans le cloud ?",
1061
+ confirmDescription: (folder) =>
1062
+ folder
1063
+ ? `Dans le cloud, l’agent ne verra pas les fichiers de ${folder}. Vous pourrez y ramener la conversation dès que ${folder} sera de nouveau disponible.`
1064
+ : "Dans le cloud, l’agent ne verra pas les fichiers de l’ordinateur. Vous pourrez y ramener la conversation dès qu’il sera de nouveau disponible.",
1065
+ confirmAction: "Exécuter dans le cloud",
1026
1066
  cancel: "Annuler",
1027
- movedToCloud: "Déplacée vers le cloud. Les fichiers d’avant sont restés sur l’ordinateur.",
1028
- movedToFolder: (folder) =>
1029
- `Déplacée vers ${folder}. Les fichiers d’avant sont restés où ils étaient.`,
1030
- movedElsewhere:
1031
- "Déplacée vers un autre dossier. Les fichiers d’avant sont restés où ils étaient.",
1067
+ placeOn: (folder, computer) => `${folder} sur ${computer}`,
1068
+ cloudPlace: "le cloud",
1069
+ movedToCloud: (from) =>
1070
+ from
1071
+ ? `Déplacée vers le cloud. Les fichiers de ${from} restent sur place.`
1072
+ : "Déplacée vers le cloud. Les fichiers de l’ordinateur restent sur place.",
1073
+ movedToFolder: (place) => `Déplacée vers ${place}. Les fichiers du cloud restent sur place.`,
1074
+ movedToComputer: (owner) =>
1075
+ `Déplacée vers ${owner ? `l’ordinateur ${ofName(owner)}` : "l’ordinateur"}. Les fichiers du cloud restent sur place.`,
1076
+ movedBetweenFolders: (folder, from) =>
1077
+ `Déplacée de ${from} vers ${folder}. Les fichiers de ${from} restent sur place.`,
1078
+ movedElsewhere: (place) =>
1079
+ `Déplacée vers ${place ?? "un autre dossier"}. Les fichiers d’avant restent où ils étaient.`,
1080
+ continuedIn: (place) =>
1081
+ `Poursuivie dans ${place}. Les fichiers de la conversation d’origine restent avec elle.`,
1082
+ continuedOnComputer: (owner) =>
1083
+ `Poursuivie sur ${owner ? `l’ordinateur ${ofName(owner)}` : "l’ordinateur"}. Les fichiers de la conversation d’origine restent avec elle.`,
1032
1084
  },
1033
1085
  sharing: {
1034
1086
  share: "Partager le fil",
@@ -1068,7 +1120,7 @@ export const fr: Translation<AgentMessages> = {
1068
1120
  cancel: "Annuler",
1069
1121
  close: "Fermer",
1070
1122
  sharedBy: (owner) => `Fil de ${owner}`,
1071
- onComputer: (owner) => `Tourne sur l’ordinateur de ${owner} : vous pouvez le suivre ici`,
1123
+ onComputer: (owner) => `Tourne sur l’ordinateur ${ofName(owner)} : vous pouvez le suivre ici`,
1072
1124
  answering: (name) => `L’agent répond à ${name}…`,
1073
1125
  continueMine: "Continuer dans mon propre fil",
1074
1126
  continuing: "Copie…",