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

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.

packages/feedback/command-feedback/src/index.ts

@@ -83,9 +83,6 @@ export function recordFeedback(session: Session, text: string): void {
  * @returns an acknowledgement containing the receiving session and anonymous
  * user ids plus the session-sharing disclosure, or a usage error when no
  * 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 {
   if (invocation.rawInput.trim().length === 0) {
@@ -96,8 +93,6 @@ function executeFeedbackCommand(invocation: CommandInvocation, ctx: Context): Co
   return {
     kind: 'success',
     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)
   }
 }
 

packages/feedback/command-feedback/tsconfig.json

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

pnpm-lock.yaml

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