Coder/deepseek-harness
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(feedback): drop rebase residue from the sharing acknowledgement

Browse Source 
The post-rebase cleanup removes leftover conflict-marker lines and the
superseded acknowledgement text from the command source, re-adds the
session-telemetry project reference, and restores the lockfile importer
link for the sharing dependency.
This commit is contained in:
Chinesezjc
2026-08-10 18:33:44 +08:00
parent 6a6148a08c
commit ac7c44a5df
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/feedback/command-feedback/src/index.ts
View File

@@ -83,9 +83,6 @@ export function recordFeedback(session: Session, text: string): void {
* @returns an acknowledgement containing the receiving session and anonymous * @returns an acknowledgement containing the receiving session and anonymous
* user ids plus the session-sharing disclosure, or a usage error when no * user ids plus the session-sharing disclosure, or a usage error when no
* feedback text was supplied. * feedback text was supplied.
* @returns an acknowledgement containing the receiving session id and the
* session-sharing disclosure, or a usage error when no feedback text was supplied.
>>>>>>> 632abf2957 (feat(feedback): disclose session sharing in the /feedback acknowledgement)
*/ */
function executeFeedbackCommand(invocation: CommandInvocation, ctx: Context): CommandResult { function executeFeedbackCommand(invocation: CommandInvocation, ctx: Context): CommandResult {
if (invocation.rawInput.trim().length === 0) { if (invocation.rawInput.trim().length === 0) {
@@ -96,8 +93,6 @@ function executeFeedbackCommand(invocation: CommandInvocation, ctx: Context): Co
return { return {
kind: 'success', kind: 'success',
text: `Feedback recorded for session ${invocation.agent.session.id}\nUser: ${getOrCreateAnonymousUserId()}. ${sharingDisclosure(telemetry)}`, text: `Feedback recorded for session ${invocation.agent.session.id}\nUser: ${getOrCreateAnonymousUserId()}. ${sharingDisclosure(telemetry)}`,
text: `Feedback recorded for session ${invocation.agent.session.id}. ${sharingDisclosure(telemetry)}`,
>>>>>>> 632abf2957 (feat(feedback): disclose session sharing in the /feedback acknowledgement)
} }
} }

3
packages/feedback/command-feedback/tsconfig.json
View File

@@ -23,6 +23,9 @@
{ {
"path": "../../session/user-id" "path": "../../session/user-id"
}, },
{
"path": "../../session/session-telemetry"
},
{ {
"path": "../../support/invariants" "path": "../../support/invariants"
} }

3
pnpm-lock.yaml generated
View File

@@ -3782,6 +3782,9 @@ importers:
'@deepseek-ai/dsh-session': '@deepseek-ai/dsh-session':
specifier: workspace:^ specifier: workspace:^
version: link:../../core/session version: link:../../core/session
'@deepseek-ai/dsh-session-telemetry':
specifier: workspace:^
version: link:../../session/session-telemetry
'@deepseek-ai/dsh-user-id': '@deepseek-ai/dsh-user-id':
specifier: workspace:^ specifier: workspace:^
version: link:../../session/user-id version: link:../../session/user-id